@matheusbsbs / matheus-bagliano / commits / a75d7b5409
Fork 0

Use 'fast-forward' all over the place

It's a compound word. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Felipe Contreras committed Oct 24, 2009 at 11:31 UTC a75d7b54097ef0d0945cbe673a9940d6c561f95c
35 files changed +71 -71
Documentation/config.txt
+1 -1
@@ -1351,7 +1351,7 @@ receive.denyCurrentBranch::
1351
1352 receive.denyNonFastForwards::
1353 If set to true, git-receive-pack will deny a ref update which is
1354 - not a fast forward. Use this to prevent such an update via a push,
1354 + not a fast-forward. Use this to prevent such an update via a push,
1355 even if that push is forced. This configuration variable is
1356 set when initializing a shared repository.
1357
Documentation/git-http-push.txt
+2 -2
@@ -82,11 +82,11 @@ destination side.
82
83 Without '--force', the <src> ref is stored at the remote only if
84 <dst> does not exist, or <dst> is a proper subset (i.e. an
85 -ancestor) of <src>. This check, known as "fast forward check",
85 +ancestor) of <src>. This check, known as "fast-forward check",
86 is performed in order to avoid accidentally overwriting the
87 remote ref and lose other peoples' commits from there.
88
89 -With '--force', the fast forward check is disabled for all refs.
89 +With '--force', the fast-forward check is disabled for all refs.
90
91 Optionally, a <ref> parameter can be prefixed with a plus '+' sign
92 to disable the fast-forward check only on that ref.
Documentation/git-push.txt
+7 -7
@@ -50,9 +50,9 @@ updated.
50 +
51 The object referenced by <src> is used to update the <dst> reference
52 on the remote side, but by default this is only allowed if the
53 -update can fast forward <dst>. By having the optional leading `{plus}`,
53 +update can fast-forward <dst>. By having the optional leading `{plus}`,
54 you can tell git to update the <dst> ref even when the update is not a
55 -fast forward. This does *not* attempt to merge <src> into <dst>. See
55 +fast-forward. This does *not* attempt to merge <src> into <dst>. See
56 EXAMPLES below for details.
57 +
58 `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`.
@@ -60,7 +60,7 @@ EXAMPLES below for details.
60 Pushing an empty <src> allows you to delete the <dst> ref from
61 the remote repository.
62 +
63 -The special refspec `:` (or `{plus}:` to allow non-fast forward updates)
63 +The special refspec `:` (or `{plus}:` to allow non-fast-forward updates)
64 directs git to push "matching" branches: for every branch that exists on
65 the local side, the remote side is updated if a branch of the same name
66 already exists on the remote side. This is the default operation mode
@@ -171,10 +171,10 @@ summary::
171 For a successfully pushed ref, the summary shows the old and new
172 values of the ref in a form suitable for using as an argument to
173 `git log` (this is `<old>..<new>` in most cases, and
174 - `<old>...<new>` for forced non-fast forward updates). For a
174 + `<old>...<new>` for forced non-fast-forward updates). For a
175 failed update, more details are given for the failure.
176 The string `rejected` indicates that git did not try to send the
177 - ref at all (typically because it is not a fast forward). The
177 + ref at all (typically because it is not a fast-forward). The
178 string `remote rejected` indicates that the remote end refused
179 the update; this rejection is typically caused by a hook on the
180 remote side. The string `remote failure` indicates that the
@@ -342,9 +342,9 @@ git push origin :experimental::
342
343 git push origin {plus}dev:master::
344 Update the origin repository's master branch with the dev branch,
345 - allowing non-fast forward updates. *This can leave unreferenced
345 + allowing non-fast-forward updates. *This can leave unreferenced
346 commits dangling in the origin repository.* Consider the
347 - following situation, where a fast forward is not possible:
347 + following situation, where a fast-forward is not possible:
348 +
349 ----
350 o---o---o---A---B origin/master
Documentation/git-read-tree.txt
+1 -1
@@ -144,7 +144,7 @@ Two Tree Merge
144 Typically, this is invoked as `git read-tree -m $H $M`, where $H
145 is the head commit of the current repository, and $M is the head
146 of a foreign tree, which is simply ahead of $H (i.e. we are in a
147 -fast forward situation).
147 +fast-forward situation).
148
149 When two trees are specified, the user is telling 'git-read-tree'
150 the following:
Documentation/git-receive-pack.txt
+1 -1
@@ -20,7 +20,7 @@ The UI for the protocol is on the 'git-send-pack' side, and the
20 program pair is meant to be used to push updates to remote
21 repository. For pull operations, see linkgit:git-fetch-pack[1].
22
23 -The command allows for creation and fast forwarding of sha1 refs
23 +The command allows for creation and fast-forwarding of sha1 refs
24 (heads/tags) on the remote end (strictly speaking, it is the
25 local end 'git-receive-pack' runs, but to the user who is sitting at
26 the send-pack end, it is updating the remote. Confused?)
Documentation/git-reset.txt
+2 -2
@@ -150,7 +150,7 @@ Automatic merge failed; fix conflicts and then commit the result.
150 $ git reset --hard <2>
151 $ git pull . topic/branch <3>
152 Updating from 41223... to 13134...
153 -Fast forward
153 +Fast-forward
154 $ git reset --hard ORIG_HEAD <4>
155 ------------
156 +
@@ -161,7 +161,7 @@ right now, so you decide to do that later.
161 which is a synonym for "git reset --hard HEAD" clears the mess
162 from the index file and the working tree.
163 <3> Merge a topic branch into the current branch, which resulted
164 -in a fast forward.
164 +in a fast-forward.
165 <4> But you decided that the topic branch is not ready for public
166 consumption yet. "pull" or "merge" always leaves the original
167 tip of the current branch in ORIG_HEAD, so resetting hard to it
Documentation/git-send-pack.txt
+2 -2
@@ -105,11 +105,11 @@ name. See linkgit:git-rev-parse[1].
105
106 Without '--force', the <src> ref is stored at the remote only if
107 <dst> does not exist, or <dst> is a proper subset (i.e. an
108 -ancestor) of <src>. This check, known as "fast forward check",
108 +ancestor) of <src>. This check, known as "fast-forward check",
109 is performed in order to avoid accidentally overwriting the
110 remote ref and lose other peoples' commits from there.
111
112 -With '--force', the fast forward check is disabled for all refs.
112 +With '--force', the fast-forward check is disabled for all refs.
113
114 Optionally, a <ref> parameter can be prefixed with a plus '+' sign
115 to disable the fast-forward check only on that ref.
Documentation/gitcore-tutorial.txt
+2 -2
@@ -993,7 +993,7 @@ would be different)
993
994 ----------------
995 Updating from ae3a2da... to a80b4aa....
996 -Fast forward (no commit created; -m option ignored)
996 +Fast-forward (no commit created; -m option ignored)
997 example | 1 +
998 hello | 1 +
999 2 files changed, 2 insertions(+), 0 deletions(-)
@@ -1003,7 +1003,7 @@ Because your branch did not contain anything more than what had
1003 already been merged into the `master` branch, the merge operation did
1004 not actually do a merge. Instead, it just updated the top of
1005 the tree of your branch to that of the `master` branch. This is
1006 -often called 'fast forward' merge.
1006 +often called 'fast-forward' merge.
1007
1008 You can run `gitk \--all` again to see how the commit ancestry
1009 looks like, or run 'show-branch', which tells you this.
Documentation/githooks.txt
+1 -1
@@ -229,7 +229,7 @@ from updating that ref.
229 This hook can be used to prevent 'forced' update on certain refs by
230 making sure that the object name is a commit object that is a
231 descendant of the commit object named by the old object name.
232 -That is, to enforce a "fast forward only" policy.
232 +That is, to enforce a "fast-forward only" policy.
233
234 It could also be used to log the old..new status. However, it
235 does not know the entire set of branches, so it would end up
Documentation/glossary-content.txt
+2 -2
@@ -124,7 +124,7 @@ to point at the new commit.
124 An evil merge is a <<def_merge,merge>> that introduces changes that
125 do not appear in any <<def_parent,parent>>.
126
127 -[[def_fast_forward]]fast forward::
127 +[[def_fast_forward]]fast-forward::
128 A fast-forward is a special type of <<def_merge,merge>> where you have a
129 <<def_revision,revision>> and you are "merging" another
130 <<def_branch,branch>>'s changes that happen to be a descendant of what
@@ -220,7 +220,7 @@ to point at the new commit.
220 conflict, manual intervention may be required to complete the
221 merge.
222 +
223 -As a noun: unless it is a <<def_fast_forward,fast forward>>, a
223 +As a noun: unless it is a <<def_fast_forward,fast-forward>>, a
224 successful merge results in the creation of a new <<def_commit,commit>>
225 representing the result of the merge, and having as
226 <<def_parent,parents>> the tips of the merged <<def_branch,branches>>.
Documentation/howto/maintain-git.txt
+1 -1
@@ -59,7 +59,7 @@ The policy.
59 not yet pass the criteria set for 'next'.
60
61 - The tips of 'master', 'maint' and 'next' branches will always
62 - fast forward, to allow people to build their own
62 + fast-forward, to allow people to build their own
63 customization on top of them.
64
65 - Usually 'master' contains all of 'maint', 'next' contains all
Documentation/howto/revert-branch-rebase.txt
+2 -2
@@ -85,7 +85,7 @@ Fortunately I did not have to; what I have in the current branch
85
86 ------------------------------------------------
87 $ git checkout master
88 -$ git merge revert-c99 ;# this should be a fast forward
88 +$ git merge revert-c99 ;# this should be a fast-forward
89 Updating from 10d781b9caa4f71495c7b34963bef137216f86a8 to e3a693c...
90 cache.h | 8 ++++----
91 commit.c | 2 +-
@@ -95,7 +95,7 @@ Updating from 10d781b9caa4f71495c7b34963bef137216f86a8 to e3a693c...
95 5 files changed, 8 insertions(+), 8 deletions(-)
96 ------------------------------------------------
97
98 -There is no need to redo the test at this point. We fast forwarded
98 +There is no need to redo the test at this point. We fast-forwarded
99 and we know 'master' matches 'revert-c99' exactly. In fact:
100
101 ------------------------------------------------
Documentation/howto/update-hook-example.txt
+1 -1
@@ -76,7 +76,7 @@ case "$1" in
76 if expr "$2" : '0*$' >/dev/null; then
77 info "The branch '$1' is new..."
78 else
79 - # updating -- make sure it is a fast forward
79 + # updating -- make sure it is a fast-forward
80 mb=$(git-merge-base "$2" "$3")
81 case "$mb,$2" in
82 "$2,$mb") info "Update is fast-forward" ;;
Documentation/pull-fetch-param.txt
+2 -2
@@ -11,9 +11,9 @@
11 +
12 The remote ref that matches <src>
13 is fetched, and if <dst> is not empty string, the local
14 -ref that matches it is fast forwarded using <src>.
14 +ref that matches it is fast-forwarded using <src>.
15 If the optional plus `+` is used, the local ref
16 -is updated even if it does not result in a fast forward
16 +is updated even if it does not result in a fast-forward
17 update.
18 +
19 [NOTE]
Documentation/user-manual.txt
+7 -7
@@ -1384,7 +1384,7 @@ were merged.
1384
1385 However, if the current branch is a descendant of the other--so every
1386 commit present in the one is already contained in the other--then git
1387 -just performs a "fast forward"; the head of the current branch is moved
1387 +just performs a "fast-forward"; the head of the current branch is moved
1388 forward to point at the head of the merged-in branch, without any new
1389 commits being created.
1390
@@ -1719,7 +1719,7 @@ producing a default commit message documenting the branch and
1719 repository that you pulled from.
1720
1721 (But note that no such commit will be created in the case of a
1722 -<<fast-forwards,fast forward>>; instead, your branch will just be
1722 +<<fast-forwards,fast-forward>>; instead, your branch will just be
1723 updated to point to the latest commit from the upstream branch.)
1724
1725 The `git pull` command can also be given "." as the "remote" repository,
@@ -1943,7 +1943,7 @@ $ git push ssh://yourserver.com/~you/proj.git master
1943 -------------------------------------------------
1944
1945 As with `git fetch`, `git push` will complain if this does not result in a
1946 -<<fast-forwards,fast forward>>; see the following section for details on
1946 +<<fast-forwards,fast-forward>>; see the following section for details on
1947 handling this case.
1948
1949 Note that the target of a "push" is normally a
@@ -1976,7 +1976,7 @@ details.
1976 What to do when a push fails
1977 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1978
1979 -If a push would not result in a <<fast-forwards,fast forward>> of the
1979 +If a push would not result in a <<fast-forwards,fast-forward>> of the
1980 remote branch, then it will fail with an error like:
1981
1982 -------------------------------------------------
@@ -2115,7 +2115,7 @@ $ git checkout release && git pull
2115
2116 Important note! If you have any local changes in these branches, then
2117 this merge will create a commit object in the history (with no local
2118 -changes git will simply do a "Fast forward" merge). Many people dislike
2118 +changes git will simply do a "fast-forward" merge). Many people dislike
2119 the "noise" that this creates in the Linux history, so you should avoid
2120 doing this capriciously in the "release" branch, as these noisy commits
2121 will become part of the permanent history when you ask Linus to pull
@@ -2729,9 +2729,9 @@ In the previous example, when updating an existing branch, "git fetch"
2729 checks to make sure that the most recent commit on the remote
2730 branch is a descendant of the most recent commit on your copy of the
2731 branch before updating your copy of the branch to point at the new
2732 -commit. Git calls this process a <<fast-forwards,fast forward>>.
2732 +commit. Git calls this process a <<fast-forwards,fast-forward>>.
2733
2734 -A fast forward looks something like this:
2734 +A fast-forward looks something like this:
2735
2736 ................................................
2737 o--o--o--o <-- old head of the branch
builtin-fetch--tool.c
+4 -4
@@ -97,21 +97,21 @@ static int update_local_ref(const char *name,
97 strcpy(newh, find_unique_abbrev(sha1_new, DEFAULT_ABBREV));
98
99 if (in_merge_bases(current, &updated, 1)) {
100 - fprintf(stderr, "* %s: fast forward to %s\n",
100 + fprintf(stderr, "* %s: fast-forward to %s\n",
101 name, note);
102 fprintf(stderr, " old..new: %s..%s\n", oldh, newh);
103 - return update_ref_env("fast forward", name, sha1_new, sha1_old);
103 + return update_ref_env("fast-forward", name, sha1_new, sha1_old);
104 }
105 if (!force) {
106 fprintf(stderr,
107 - "* %s: not updating to non-fast forward %s\n",
107 + "* %s: not updating to non-fast-forward %s\n",
108 name, note);
109 fprintf(stderr,
110 " old...new: %s...%s\n", oldh, newh);
111 return 1;
112 }
113 fprintf(stderr,
114 - "* %s: forcing update to non-fast forward %s\n",
114 + "* %s: forcing update to non-fast-forward %s\n",
115 name, note);
116 fprintf(stderr, " old...new: %s...%s\n", oldh, newh);
117 return update_ref_env("forced-update", name, sha1_new, sha1_old);
builtin-fetch.c
+2 -2
@@ -269,7 +269,7 @@ static int update_local_ref(struct ref *ref,
269 strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));
270 strcat(quickref, "..");
271 strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV));
272 - r = s_update_ref("fast forward", ref, 1);
272 + r = s_update_ref("fast-forward", ref, 1);
273 sprintf(display, "%c %-*s %-*s -> %s%s", r ? '!' : ' ',
274 SUMMARY_WIDTH, quickref, REFCOL_WIDTH, remote,
275 pretty_ref, r ? " (unable to update local ref)" : "");
@@ -287,7 +287,7 @@ static int update_local_ref(struct ref *ref,
287 r ? "unable to update local ref" : "forced update");
288 return r;
289 } else {
290 - sprintf(display, "! %-*s %-*s -> %s (non fast forward)",
290 + sprintf(display, "! %-*s %-*s -> %s (non-fast-forward)",
291 SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote,
292 pretty_ref);
293 return 1;
builtin-merge.c
+4 -4
@@ -166,7 +166,7 @@ static struct option builtin_merge_options[] = {
166 OPT_BOOLEAN(0, "commit", &option_commit,
167 "perform a commit if the merge succeeds (default)"),
168 OPT_BOOLEAN(0, "ff", &allow_fast_forward,
169 - "allow fast forward (default)"),
169 + "allow fast-forward (default)"),
170 OPT_CALLBACK('s', "strategy", &use_strategies, "strategy",
171 "merge strategy to use", option_parse_strategy),
172 OPT_CALLBACK('m', "message", &merge_msg, "message",
@@ -1013,7 +1013,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
1013 hex,
1014 find_unique_abbrev(remoteheads->item->object.sha1,
1015 DEFAULT_ABBREV));
1016 - strbuf_addstr(&msg, "Fast forward");
1016 + strbuf_addstr(&msg, "Fast-forward");
1017 if (have_message)
1018 strbuf_addstr(&msg,
1019 " (no commit created; -m option ignored)");
@@ -1031,12 +1031,12 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
1031 } else if (!remoteheads->next && common->next)
1032 ;
1033 /*
1034 - * We are not doing octopus and not fast forward. Need
1034 + * We are not doing octopus and not fast-forward. Need
1035 * a real merge.
1036 */
1037 else if (!remoteheads->next && !common->next && option_commit) {
1038 /*
1039 - * We are not doing octopus, not fast forward, and have
1039 + * We are not doing octopus, not fast-forward, and have
1040 * only one common.
1041 */
1042 refresh_cache(REFRESH_QUIET);
builtin-push.c
+1 -1
@@ -159,7 +159,7 @@ static int do_push(const char *repo, int flags)
159 error("failed to push some refs to '%s'", url[i]);
160 if (nonfastforward && advice_push_nonfastforward) {
161 printf("To prevent you from losing history, non-fast-forward updates were rejected\n"
162 - "Merge the remote changes before pushing again. See the 'non-fast forward'\n"
162 + "Merge the remote changes before pushing again. See the 'non-fast-forward'\n"
163 "section of 'git push --help' for details.\n");
164 }
165 errs++;
builtin-receive-pack.c
+2 -2
@@ -329,9 +329,9 @@ static const char *update(struct command *cmd)
329 break;
330 free_commit_list(bases);
331 if (!ent) {
332 - error("denying non-fast forward %s"
332 + error("denying non-fast-forward %s"
333 " (you should pull first)", name);
334 - return "non-fast forward";
334 + return "non-fast-forward";
335 }
336 }
337 if (run_update_hook(cmd)) {
builtin-remote.c
+1 -1
@@ -953,7 +953,7 @@ static int show_push_info_item(struct string_list_item *item, void *cb_data)
953 status = "up to date";
954 break;
955 case PUSH_STATUS_FASTFORWARD:
956 - status = "fast forwardable";
956 + status = "fast-forwardable";
957 break;
958 case PUSH_STATUS_OUTOFDATE:
959 status = "local out of date";
builtin-send-pack.c
+1 -1
@@ -246,7 +246,7 @@ static int print_one_push_status(struct ref *ref, const char *dest, int count)
246 break;
247 case REF_STATUS_REJECT_NONFASTFORWARD:
248 print_ref_status('!', "[rejected]", ref, ref->peer_ref,
249 - "non-fast forward");
249 + "non-fast-forward");
250 break;
251 case REF_STATUS_REMOTE_REJECT:
252 print_ref_status('!', "[remote rejected]", ref,
contrib/examples/git-merge.sh
+4 -4
@@ -14,7 +14,7 @@ summary (synonym to --stat)
14 log add list of one-line log to merge commit message
15 squash create a single commit instead of doing a merge
16 commit perform a commit if the merge succeeds (default)
17 -ff allow fast forward (default)
17 +ff allow fast-forward (default)
18 s,strategy= merge strategy to use
19 m,message= message to be used for the merge commit (if any)
20 "
@@ -353,7 +353,7 @@ t,1,"$head",*)
353 # Again the most common case of merging one remote.
354 echo "Updating $(git rev-parse --short $head)..$(git rev-parse --short $1)"
355 git update-index --refresh 2>/dev/null
356 - msg="Fast forward"
356 + msg="Fast-forward"
357 if test -n "$have_message"
358 then
359 msg="$msg (no commit created; -m option ignored)"
@@ -365,11 +365,11 @@ t,1,"$head",*)
365 exit 0
366 ;;
367 ?,1,?*"$LF"?*,*)
368 - # We are not doing octopus and not fast forward. Need a
368 + # We are not doing octopus and not fast-forward. Need a
369 # real merge.
370 ;;
371 ?,1,*,)
372 - # We are not doing octopus, not fast forward, and have only
372 + # We are not doing octopus, not fast-forward, and have only
373 # one common.
374 git update-index --refresh 2>/dev/null
375 case "$allow_trivial_merge" in
contrib/examples/git-resolve.sh
+1 -1
@@ -48,7 +48,7 @@ case "$common" in
48 "$head")
49 echo "Updating $(git rev-parse --short $head)..$(git rev-parse --short $merge)"
50 git read-tree -u -m $head $merge || exit 1
51 - git update-ref -m "resolve $merge_name: Fast forward" \
51 + git update-ref -m "resolve $merge_name: Fast-forward" \
52 HEAD "$merge" "$head"
53 git diff-tree -p $head $merge | git apply --stat
54 dropheads
contrib/hooks/post-receive-email
+3 -3
@@ -315,8 +315,8 @@ generate_update_branch_email()
315 # "remotes/" will be ignored as well.
316
317 # List all of the revisions that were removed by this update, in a
318 - # fast forward update, this list will be empty, because rev-list O
319 - # ^N is empty. For a non fast forward, O ^N is the list of removed
318 + # fast-forward update, this list will be empty, because rev-list O
319 + # ^N is empty. For a non-fast-forward, O ^N is the list of removed
320 # revisions
321 fast_forward=""
322 rev=""
@@ -411,7 +411,7 @@ generate_update_branch_email()
411 # revision because the base is effectively a random revision at this
412 # point - the user will be interested in what this revision changed
413 # - including the undoing of previous revisions in the case of
414 - # non-fast forward updates.
414 + # non-fast-forward updates.
415 echo ""
416 echo "Summary of changes:"
417 git diff-tree --stat --summary --find-copies-harder $oldrev..$newrev
git-merge-octopus.sh
+1 -1
@@ -81,7 +81,7 @@ do
81 # tree as the intermediate result of the merge.
82 # We still need to count this as part of the parent set.
83
84 - echo "Fast forwarding to: $SHA1"
84 + echo "Fast-forwarding to: $SHA1"
85 git read-tree -u -m $head $SHA1 || exit
86 MRC=$SHA1 MRT=$(git write-tree)
87 continue
git-pull.sh
+1 -1
@@ -171,7 +171,7 @@ then
171 # First update the working tree to match $curr_head.
172
173 echo >&2 "Warning: fetch updated the current branch head."
174 - echo >&2 "Warning: fast forwarding your working tree from"
174 + echo >&2 "Warning: fast-forwarding your working tree from"
175 echo >&2 "Warning: commit $orig_head."
176 git update-index -q --refresh
177 git read-tree -u -m "$orig_head" "$curr_head" ||
git-rebase--interactive.sh
+3 -3
@@ -168,7 +168,7 @@ pick_one () {
168 output git reset --hard $sha1
169 test "a$1" = a-n && output git reset --soft $current_sha1
170 sha1=$(git rev-parse --short $sha1)
171 - output warn Fast forward to $sha1
171 + output warn Fast-forward to $sha1
172 else
173 output git cherry-pick "$@"
174 fi
@@ -248,9 +248,9 @@ pick_one_preserving_merges () {
248 done
249 case $fast_forward in
250 t)
251 - output warn "Fast forward to $sha1"
251 + output warn "Fast-forward to $sha1"
252 output git reset --hard $sha1 ||
253 - die "Cannot fast forward to $sha1"
253 + die "Cannot fast-forward to $sha1"
254 ;;
255 f)
256 first_parent=$(expr "$new_parents" : ' \([^ ]*\)')
git-rebase.sh
+1 -1
@@ -496,7 +496,7 @@ then
496 fi
497
498 # If the $onto is a proper descendant of the tip of the branch, then
499 -# we just fast forwarded.
499 +# we just fast-forwarded.
500 if test "$mb" = "$branch"
501 then
502 say "Fast-forwarded $branch_name to $onto_name."
t/t1001-read-tree-m-2way.sh
+3 -3
@@ -5,7 +5,7 @@
5
6 test_description='Two way merge with read-tree -m $H $M
7
8 -This test tries two-way merge (aka fast forward with carry forward).
8 +This test tries two-way merge (aka fast-forward with carry forward).
9
10 There is the head (called H) and another commit (called M), which is
11 simply ahead of H. The index and the work tree contains a state that
@@ -51,7 +51,7 @@ check_cache_at () {
51 }
52
53 cat >bozbar-old <<\EOF
54 -This is a sample file used in two-way fast forward merge
54 +This is a sample file used in two-way fast-forward merge
55 tests. Its second line ends with a magic word bozbar
56 which will be modified by the merged head to gnusto.
57 It has some extra lines so that external tools can
@@ -300,7 +300,7 @@ test_expect_success \
300 echo gnusto gnusto >bozbar &&
301 if read_tree_twoway $treeH $treeM; then false; else :; fi'
302
303 -# This fails with straight two-way fast forward.
303 +# This fails with straight two-way fast-forward.
304 test_expect_success \
305 '22 - local change cache updated.' \
306 'rm -f .git/index &&
t/t5505-remote.sh
+1 -1
@@ -158,7 +158,7 @@ cat > test/expect << EOF
158 another
159 master
160 Local refs configured for 'git push':
161 - ahead forces to master (fast forwardable)
161 + ahead forces to master (fast-forwardable)
162 master pushes to another (up to date)
163 EOF
164
t/t5518-fetch-exit-status.sh
+1 -1
@@ -22,7 +22,7 @@ test_expect_success setup '
22 git commit -a -m next
23 '
24
25 -test_expect_success 'non fast forward fetch' '
25 +test_expect_success 'non-fast-forward fetch' '
26
27 test_must_fail git fetch . master:side
28
t/t6028-merge-up-to-date.sh
+1 -1
@@ -1,6 +1,6 @@
1 #!/bin/sh
2
3 -test_description='merge fast forward and up to date'
3 +test_description='merge fast-forward and up to date'
4
5 . ./test-lib.sh
6
transport.c
+1 -1
@@ -668,7 +668,7 @@ static int print_one_push_status(struct ref *ref, const char *dest, int count, i
668 break;
669 case REF_STATUS_REJECT_NONFASTFORWARD:
670 print_ref_status('!', "[rejected]", ref, ref->peer_ref,
671 - "non-fast forward", porcelain);
671 + "non-fast-forward", porcelain);
672 break;
673 case REF_STATUS_REMOTE_REJECT:
674 print_ref_status('!', "[remote rejected]", ref,
unpack-trees.c
+1 -1
@@ -895,7 +895,7 @@ int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o)
895 * Two-way merge.
896 *
897 * The rule is to "carry forward" what is in the index without losing
898 - * information across a "fast forward", favoring a successful merge
898 + * information across a "fast-forward", favoring a successful merge
899 * over a merge failure when it makes sense. For details of the
900 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
901 *