| commit | 66fa1b2c354f79ed48f5986ee700ccb2d167ccbf | |
| author | Richard Hansen <rhansen@bbn.com> | |
| Thu, 16 May 2013 22:26:00 +0000 (16 18:26 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 16 May 2013 23:40:00 +0000 (16 16:40 -0700) | ||
| tree | 869014b7d8899375bf0816b337025639096d1dff | treesnapshot (tar.gz zip) |
| parent | 92758dd2a2de94c90c0697ef0e8174c3543a47f9 | commitdiff |
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>
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 | diffblobblamehistory |