]> git.ipfire.org Git - thirdparty/git.git/commit
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)
commit0af6d5dd062909eee3762e5fdec873ba6e7754b4
tree0612dd59979cb5060fe6dd345c9e0d373f1e75ee
parente8d259064146f24abb1280aff0ca3ead20218244
parent437591a9d738b56141149c9293c3b4840f5302f0
Merge branch 'pw/doc-synopsis-markup-opmode-options'

Docfix.

* pw/doc-synopsis-markup-opmode-options:
  show --continue/skip etc. consistently in synopsis
Documentation/git-merge.txt
Documentation/git-rebase.txt