projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 92758dd) | patch
Documentation/merge-options.txt: restore `-e` option
authorRichard Hansen <rhansen@bbn.com>
Thu, 16 May 2013 22:26:00 +0000 (18:26 -0400)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 May 2013 23:40:00 +0000 (16:40 -0700)
commit66fa1b2c354f79ed48f5986ee700ccb2d167ccbf
tree869014b7d8899375bf0816b337025639096d1dfftree | snapshot
parent92758dd2a2de94c90c0697ef0e8174c3543a47f9commit | diff
Documentation/merge-options.txt: restore `-e` option

It looks like commit f8246281af9adb0fdddbcc90d2e19cb5cd5217e5
unintentionally removed the documentation for the `-e` option.

Signed-off-by: Richard Hansen <rhansen@bbn.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/merge-options.txt diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.