diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-11-10 22:02:20 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-11-10 22:02:20 +0000 |
| commit | 446ed777193d588b52d2b3762d359647ba2c301e (patch) | |
| tree | e8f4e1d66cd3c63324fc755b154aba41a92884cf /merge-options.txt | |
| parent | a1f86336a1ae7a49b2a8384cc7d14eaa7a186cd3 (diff) | |
| download | git-htmldocs-446ed777193d588b52d2b3762d359647ba2c301e.tar.gz | |
Autogenerated HTML docs for v1.6.5.2-179-g8ac7a
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/merge-options.txt b/merge-options.txt index 48d04a5d8..fec339430 100644 --- a/merge-options.txt +++ b/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 |