mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/doc-merge-options'

Browse Source 
* jc/doc-merge-options:
  Documentation/merge-options.txt: group "ff" related options together
This commit is contained in:
Junio C Hamano
2012-02-26 23:05:42 -08:00
parent 31e3d834b3 690b297582
commit 5419127d04
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Documentation/merge-options.txt
View File

@ -24,13 +24,18 @@ updated behaviour, the environment variable `GIT_MERGE_AUTOEDIT` can be
set to `no` at the beginning of them. set to `no` at the beginning of them.
--ff:: --ff::
When the merge resolves as a fast-forward, only update the branch
pointer, without creating a merge commit. This is the default
behavior.
--no-ff:: --no-ff::
Do not generate a merge commit if the merge resolved as Create a merge commit even when the merge resolves as a
a fast-forward, only update the branch pointer. This is fast-forward.
the default behavior of git-merge.
+ --ff-only::
With --no-ff Generate a merge commit even if the merge Refuse to merge and exit with a non-zero status unless the
resolved as a fast-forward. current `HEAD` is already up-to-date or the merge can be
resolved as a fast-forward.
--log[=<n>]:: --log[=<n>]::
--no-log:: --no-log::
@ -65,11 +70,6 @@ merge.
With --no-squash perform the merge and commit the result. This With --no-squash perform the merge and commit the result. This
option can be used to override --squash. option can be used to override --squash.
--ff-only::
Refuse to merge and exit with a non-zero status unless the
current `HEAD` is already up-to-date or the merge can be
resolved as a fast-forward.
-s <strategy>:: -s <strategy>::
--strategy=<strategy>:: --strategy=<strategy>::
Use the given merge strategy; can be supplied more than Use the given merge strategy; can be supplied more than