diff options
| author |  John Keeping <john@keeping.me.uk> | 2014-05-22 14:58:37 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-05-27 12:27:36 -0700 |
| commit | 6d2b06f02b9c69351a55a2cad0cfab33ecb6ee6f (patch) | |
| tree | 2a0986263038305968fa368324a6a3047a25b3f8 /contrib/completion | |
| parent | Update draft release notes to 2.0 (diff) | |
| download | tgif-6d2b06f02b9c69351a55a2cad0cfab33ecb6ee6f.tar.xz | |
completion: add a note that merge options are shared
This should avoid future confusion after a subsequent patch has added
some options to __git_merge_options and some directly in _git_merge().
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/completion')
| -rw-r--r-- | contrib/completion/git-completion.bash | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 2c59a76bc2..ff97c200ee 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1472,6 +1472,7 @@ _git_log () __git_complete_revlist } +# Common merge options shared by git-merge(1) and git-pull(1). __git_merge_options=" --no-commit --no-stat --log --no-log --squash --strategy --commit --stat --no-squash --ff --no-ff --ff-only --edit --no-edit |