H0llyW00dzZ/git
H0llyW00dzZ/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-04-17 19:55:44 +00:00
Code Releases Activity

completion: add a note that merge options are shared

Browse Source 
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>
This commit is contained in:
John Keeping 2014-05-22 14:58:37 +01:00 committed by Junio C Hamano
parent 4a28f169ad
commit 6d2b06f02b
1 changed files with 1 additions and 0 deletions

1
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