author | W. Trevor King <wking@tremily.us> |
---|---|
Thu, 12 Oct 2017 18:35:42 +0000 (11:35 -0700) | |
committer | Junio C Hamano <gitster@pobox.com> |
Fri, 13 Oct 2017 01:47:36 +0000 (10:47 +0900) | |
commit | 3a4d2c7 ... 3750dbc3c8165f362c0a3c0d1c775c8a |
tree | 4d8e47a ... a3cbe09b993d6013a8f2dac41be8f512 (tree) |
parent | 111ef79 ... fe185f8731920569450f6a65320f5d5f (diff) |
Documentation/git-merge.txt | diff | blob | history | |
Documentation/merge-options.txt | diff | blob | history | |
builtin/pull.c | diff | blob | history | |
t/t5521-pull-options.sh | diff | blob | history |