Merge branch 'pw/doc-synopsis-markup-opmode-options'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Jul 2019 22:25:38 +0000 (15:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Jul 2019 22:25:39 +0000 (15:25 -0700)
commit0af6d5d...062909eee3762e5fdec873ba6e7754b4
tree0612dd5...979cb5060fe6dd345c9e0d373f1e75eecopy hash to clipboard (tree)
parente8d2590...4146f24abb1280aff0ca3ead20218244copy hash to clipboard (diff)
parent437591a...d738b56141149c9293c3b4840f5302f0copy hash to clipboard (diff)
Documentation/git-merge.txt
Documentation/git-rebase.txt