diff options
| author | Elijah Newren <newren@gmail.com> | 2021-07-22 05:04:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-22 18:54:30 (GMT) |
| commit | 359ff6938990a438b99e95fe36b6b359f3eb9811 (patch) | |
| tree | 4203eb661be2b388947b38b8493c97fefa79fea8 /Documentation/git-merge.txt | |
| parent | 031e2f7ae195069d00d21cde906fce5b0318dbdd (diff) | |
| download | git-359ff6938990a438b99e95fe36b6b359f3eb9811.zip git-359ff6938990a438b99e95fe36b6b359f3eb9811.tar.gz git-359ff6938990a438b99e95fe36b6b359f3eb9811.tar.bz2 | |
pull: update docs & code for option compatibility with rebasing
git-pull.txt includes merge-options.txt, which is written assuming
merges will happen. git-pull has allowed rebases for many years; update
the documentation to reflect that.
While at it, pass any `--signoff` flag through to the rebase backend too
so that we don't have to document it as merge-specific. Rebase has
supported the --signoff flag for years now as well.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 3819fad..e4f3352 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -61,6 +61,8 @@ merge has resulted in conflicts. OPTIONS ------- +:git-merge: 1 + include::merge-options.txt[] -m <msg>:: |