diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-12 16:15:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-12 16:15:23 -0700 |
| commit | ce785c5944847cd108512672021b32f7c381b756 (patch) | |
| tree | 3f724384d012fec7eec658c941f5208682c2c72a /builtin-fetch.c | |
| parent | b66e00f12a4e0eef7c9f994db5386e066d726778 (diff) | |
| parent | 05207a28818623e417b69f337a9e8604d799d09d (diff) | |
| download | git-ce785c5944847cd108512672021b32f7c381b756.tar.gz git-ce785c5944847cd108512672021b32f7c381b756.tar.xz | |
Merge branch 'ho/maint-dashless' into maint
* ho/maint-dashless:
Start conforming code to "git subcmd" style part 2
Diffstat (limited to 'builtin-fetch.c')
| -rw-r--r-- | builtin-fetch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-fetch.c b/builtin-fetch.c index 7eec4a0e4..ee93d3a93 100644 --- a/builtin-fetch.c +++ b/builtin-fetch.c @@ -86,10 +86,10 @@ static void add_merge_config(struct ref **head, /* * Not fetched to a tracking branch? We need to fetch * it anyway to allow this branch's "branch.$name.merge" - * to be honored by git-pull, but we do not have to + * to be honored by 'git pull', but we do not have to * fail if branch.$name.merge is misconfigured to point * at a nonexisting branch. If we were indeed called by - * git-pull, it will notice the misconfiguration because + * 'git pull', it will notice the misconfiguration because * there is no entry in the resulting FETCH_HEAD marked * for merging. */ @@ -396,7 +396,7 @@ static int store_updated_refs(const char *url, const char *remote_name, * The refs we are going to fetch are in to_fetch (nr_heads in * total). If running * - * $ git-rev-list --objects to_fetch[0] to_fetch[1] ... --not --all + * $ git rev-list --objects to_fetch[0] to_fetch[1] ... --not --all * * does not error out, that means everything reachable from the * refs we are going to fetch exists and is connected to some of |