Andrew's git / gitweb.git / diff
?
completion: add a note that merge options are shared
authorJohn Keeping <john@keeping.me.uk>
Thu, 22 May 2014 13:58:37 +0000 (14:58 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 May 2014 19:27:36 +0000 (12:27 -0700)
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>
No differences found