| commit | 6d2b06f02b9c69351a55a2cad0cfab33ecb6ee6f | |
| author | John Keeping <john@keeping.me.uk> | |
| Thu, 22 May 2014 13:58:37 +0000 (22 14:58 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 May 2014 19:27:36 +0000 (27 12:27 -0700) | ||
| tree | 2a0986263038305968fa368324a6a3047a25b3f8 | treesnapshot (tar.gz zip) |
| parent | 4a28f169ad29ba452e0e7bea2583914c10c58322 | commitdiff |
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>
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>
| contrib/completion/git-completion.bash | diffblobblamehistory |