diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-27 07:05:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-27 07:05:42 (GMT) |
| commit | 5419127d0475a78983696544ca5e672e8ea4075d (patch) | |
| tree | 70d9782312c8392f1ccf704e33248955c496b04f /Documentation/merge-options.txt | |
| parent | 31e3d834b39b773831c3c3e2637f2d99bfad9cbf (diff) | |
| parent | 690b29758289ac81062159c178b6d917f06e9862 (diff) | |
| download | git-5419127d0475a78983696544ca5e672e8ea4075d.zip git-5419127d0475a78983696544ca5e672e8ea4075d.tar.gz git-5419127d0475a78983696544ca5e672e8ea4075d.tar.bz2 | |
Merge branch 'jc/doc-merge-options'
* jc/doc-merge-options:
Documentation/merge-options.txt: group "ff" related options together
Diffstat (limited to 'Documentation/merge-options.txt')
| -rw-r--r-- | Documentation/merge-options.txt | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index f2f1d0f..0bcbe0a 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -24,13 +24,18 @@ updated behaviour, the environment variable `GIT_MERGE_AUTOEDIT` can be set to `no` at the beginning of them. --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:: - Do not generate a merge commit if the merge resolved as - a fast-forward, only update the branch pointer. This is - the default behavior of git-merge. -+ -With --no-ff Generate a merge commit even if the merge -resolved as a fast-forward. + Create a merge commit even when the merge resolves as a + fast-forward. + +--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. --log[=<n>]:: --no-log:: @@ -65,11 +70,6 @@ merge. With --no-squash perform the merge and commit the result. This 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>:: --strategy=<strategy>:: Use the given merge strategy; can be supplied more than |