diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-06-02 15:48:22 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-06-02 15:48:22 -0700 |
commit | 499eaceb217df573fb3698d7a52e3e5a9b4173bc (patch) | |
tree | 4b09c6778ed4eb6a51e5a3a41db35a1c964ed475 /fast-import.c | |
parent | 7abc6b715148118518a6fbdcef82b3e0dabbaa17 (diff) | |
parent | 66fa1b2c354f79ed48f5986ee700ccb2d167ccbf (diff) | |
download | git-499eaceb217df573fb3698d7a52e3e5a9b4173bc.tar.gz |
Merge branch 'rh/merge-options-doc-fix'
* rh/merge-options-doc-fix:
Documentation/merge-options.txt: restore `-e` option
Diffstat (limited to 'fast-import.c')
0 files changed, 0 insertions, 0 deletions