git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4a28f16)
completion: add a note that merge options are shared
authorJohn Keeping <redacted>
Thu, 22 May 2014 13:58:37 +0000 (14:58 +0100)
committerJunio C Hamano <redacted>
Tue, 27 May 2014 19:27:36 +0000 (12:27 -0700)
commit6d2b06f02b9c69351a55a2cad0cfab33ecb6ee6f
tree2a0986263038305968fa368324a6a3047a25b3f8tree | snapshot
parent4a28f169ad29ba452e0e7bea2583914c10c58322commit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
contrib/completion/git-completion.bash diff | blob | history
git clone https://git.99rst.org/PROJECT