diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-11-10 12:32:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-10 12:32:59 -0800 |
| commit | 3cc335181fdeba6cb25e9a6e55217b2e8d18e6b1 (patch) | |
| tree | 42fc1b67e7237c5c3913004c53bc8c14dea479c8 /Documentation/merge-options.txt | |
| parent | Merge branch 'vl/maint-openssl-signature-change' (diff) | |
| parent | Teach 'git merge' and 'git pull' the option --ff-only (diff) | |
| download | tgif-3cc335181fdeba6cb25e9a6e55217b2e8d18e6b1.tar.xz | |
Merge branch 'bg/merge-ff-only'
* bg/merge-ff-only:
Teach 'git merge' and 'git pull' the option --ff-only
Diffstat (limited to 'Documentation/merge-options.txt')
| -rw-r--r-- | Documentation/merge-options.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 48d04a5d88..fec3394305 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -49,6 +49,11 @@ 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 |