git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9d9a2d 66fa1b2)
Merge branch 'rh/merge-options-doc-fix' into maint
authorJunio C Hamano <redacted>
Wed, 3 Jul 2013 22:36:30 +0000 (15:36 -0700)
committerJunio C Hamano <redacted>
Wed, 3 Jul 2013 22:36:30 +0000 (15:36 -0700)
* rh/merge-options-doc-fix:
  Documentation/merge-options.txt: restore `-e` option

1  2 
Documentation/merge-options.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/merge-options.txt
Simple merge
git clone https://git.99rst.org/PROJECT