Skip to content

Commit 4d8c325

Browse files
gitstergitster
committed
Merge branch 'fc/doc-fast-forward'
* fc/doc-fast-forward: Use 'fast-forward' all over the place Conflicts: builtin-merge.c
2 parents 9fa51ff + a75d7b5 commit 4d8c325

35 files changed

+73
-73
lines changed

‎Documentation/config.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1360,7 +1360,7 @@ receive.denyCurrentBranch::
13601360

13611361
receive.denyNonFastForwards::
13621362
If set to true, git-receive-pack will deny a ref update which is
1363-
not a fast forward. Use this to prevent such an update via a push,
1363+
not a fast-forward. Use this to prevent such an update via a push,
13641364
even if that push is forced. This configuration variable is
13651365
set when initializing a shared repository.
13661366

‎Documentation/git-http-push.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ destination side.
8282

8383
Without '--force', the <src> ref is stored at the remote only if
8484
<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",
8686
is performed in order to avoid accidentally overwriting the
8787
remote ref and lose other peoples' commits from there.
8888

89-
With '--force', the fast forward check is disabled for all refs.
89+
With '--force', the fast-forward check is disabled for all refs.
9090

9191
Optionally, a <ref> parameter can be prefixed with a plus '+' sign
9292
to disable the fast-forward check only on that ref.

‎Documentation/git-push.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,17 @@ updated.
5050
+
5151
The object referenced by <src> is used to update the <dst> reference
5252
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}`,
5454
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
5656
EXAMPLES below for details.
5757
+
5858
`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`.
5959
+
6060
Pushing an empty <src> allows you to delete the <dst> ref from
6161
the remote repository.
6262
+
63-
The special refspec `:` (or `{plus}:` to allow non-fast forward updates)
63+
The special refspec `:` (or `{plus}:` to allow non-fast-forward updates)
6464
directs git to push "matching" branches: for every branch that exists on
6565
the local side, the remote side is updated if a branch of the same name
6666
already exists on the remote side. This is the default operation mode
@@ -176,10 +176,10 @@ summary::
176176
For a successfully pushed ref, the summary shows the old and new
177177
values of the ref in a form suitable for using as an argument to
178178
`git log` (this is `<old>..<new>` in most cases, and
179-
`<old>...<new>` for forced non-fast forward updates). For a
179+
`<old>...<new>` for forced non-fast-forward updates). For a
180180
failed update, more details are given for the failure.
181181
The string `rejected` indicates that git did not try to send the
182-
ref at all (typically because it is not a fast forward). The
182+
ref at all (typically because it is not a fast-forward). The
183183
string `remote rejected` indicates that the remote end refused
184184
the update; this rejection is typically caused by a hook on the
185185
remote side. The string `remote failure` indicates that the
@@ -347,9 +347,9 @@ git push origin :experimental::
347347

348348
git push origin {plus}dev:master::
349349
Update the origin repository's master branch with the dev branch,
350-
allowing non-fast forward updates. *This can leave unreferenced
350+
allowing non-fast-forward updates. *This can leave unreferenced
351351
commits dangling in the origin repository.* Consider the
352-
following situation, where a fast forward is not possible:
352+
following situation, where a fast-forward is not possible:
353353
+
354354
----
355355
o---o---o---A---B origin/master

‎Documentation/git-read-tree.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ Two Tree Merge
144144
Typically, this is invoked as `git read-tree -m $H $M`, where $H
145145
is the head commit of the current repository, and $M is the head
146146
of a foreign tree, which is simply ahead of $H (i.e. we are in a
147-
fast forward situation).
147+
fast-forward situation).
148148

149149
When two trees are specified, the user is telling 'git-read-tree'
150150
the following:

‎Documentation/git-receive-pack.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ The UI for the protocol is on the 'git-send-pack' side, and the
2020
program pair is meant to be used to push updates to remote
2121
repository. For pull operations, see linkgit:git-fetch-pack[1].
2222

23-
The command allows for creation and fast forwarding of sha1 refs
23+
The command allows for creation and fast-forwarding of sha1 refs
2424
(heads/tags) on the remote end (strictly speaking, it is the
2525
local end 'git-receive-pack' runs, but to the user who is sitting at
2626
the send-pack end, it is updating the remote. Confused?)

‎Documentation/git-reset.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ Automatic merge failed; fix conflicts and then commit the result.
150150
$ git reset --hard <2>
151151
$ git pull . topic/branch <3>
152152
Updating from 41223... to 13134...
153-
Fast forward
153+
Fast-forward
154154
$ git reset --hard ORIG_HEAD <4>
155155
------------
156156
+
@@ -161,7 +161,7 @@ right now, so you decide to do that later.
161161
which is a synonym for "git reset --hard HEAD" clears the mess
162162
from the index file and the working tree.
163163
<3> Merge a topic branch into the current branch, which resulted
164-
in a fast forward.
164+
in a fast-forward.
165165
<4> But you decided that the topic branch is not ready for public
166166
consumption yet. "pull" or "merge" always leaves the original
167167
tip of the current branch in ORIG_HEAD, so resetting hard to it

‎Documentation/git-send-pack.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@ name. See linkgit:git-rev-parse[1].
105105

106106
Without '--force', the <src> ref is stored at the remote only if
107107
<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",
109109
is performed in order to avoid accidentally overwriting the
110110
remote ref and lose other peoples' commits from there.
111111

112-
With '--force', the fast forward check is disabled for all refs.
112+
With '--force', the fast-forward check is disabled for all refs.
113113

114114
Optionally, a <ref> parameter can be prefixed with a plus '+' sign
115115
to disable the fast-forward check only on that ref.

‎Documentation/gitcore-tutorial.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -993,7 +993,7 @@ would be different)
993993

994994
----------------
995995
Updating from ae3a2da... to a80b4aa....
996-
Fast forward (no commit created; -m option ignored)
996+
Fast-forward (no commit created; -m option ignored)
997997
example | 1 +
998998
hello | 1 +
999999
2 files changed, 2 insertions(+), 0 deletions(-)
@@ -1003,7 +1003,7 @@ Because your branch did not contain anything more than what had
10031003
already been merged into the `master` branch, the merge operation did
10041004
not actually do a merge. Instead, it just updated the top of
10051005
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.
10071007

10081008
You can run `gitk \--all` again to see how the commit ancestry
10091009
looks like, or run 'show-branch', which tells you this.

‎Documentation/githooks.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ from updating that ref.
229229
This hook can be used to prevent 'forced' update on certain refs by
230230
making sure that the object name is a commit object that is a
231231
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.
233233

234234
It could also be used to log the old..new status. However, it
235235
does not know the entire set of branches, so it would end up

‎Documentation/glossary-content.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ to point at the new commit.
124124
An evil merge is a <<def_merge,merge>> that introduces changes that
125125
do not appear in any <<def_parent,parent>>.
126126

127-
[[def_fast_forward]]fast forward::
127+
[[def_fast_forward]]fast-forward::
128128
A fast-forward is a special type of <<def_merge,merge>> where you have a
129129
<<def_revision,revision>> and you are "merging" another
130130
<<def_branch,branch>>'s changes that happen to be a descendant of what
@@ -220,7 +220,7 @@ to point at the new commit.
220220
conflict, manual intervention may be required to complete the
221221
merge.
222222
+
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
224224
successful merge results in the creation of a new <<def_commit,commit>>
225225
representing the result of the merge, and having as
226226
<<def_parent,parents>> the tips of the merged <<def_branch,branches>>.

0 commit comments

Comments
 (0)