| commit | 499eaceb217df573fb3698d7a52e3e5a9b4173bc | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 2 Jun 2013 22:48:22 +0000 (2 15:48 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 2 Jun 2013 22:48:22 +0000 (2 15:48 -0700) | ||
| tree | 4b09c6778ed4eb6a51e5a3a41db35a1c964ed475 | treesnapshot (tar.gz zip) |
| parent | 7abc6b715148118518a6fbdcef82b3e0dabbaa17 | commitdiff |
| parent | 66fa1b2c354f79ed48f5986ee700ccb2d167ccbf | commitdiff |
Merge branch 'rh/merge-options-doc-fix'
* rh/merge-options-doc-fix:
Documentation/merge-options.txt: restore `-e` option
* rh/merge-options-doc-fix:
Documentation/merge-options.txt: restore `-e` option
| Documentation/merge-options.txt | diff1 | diff2 | blobhistory |