summaryrefslogtreecommitdiff
path: root/fast-import.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-02 15:48:22 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-02 15:48:22 -0700
commit499eaceb217df573fb3698d7a52e3e5a9b4173bc (patch)
tree4b09c6778ed4eb6a51e5a3a41db35a1c964ed475 /fast-import.c
parent7abc6b715148118518a6fbdcef82b3e0dabbaa17 (diff)
parent66fa1b2c354f79ed48f5986ee700ccb2d167ccbf (diff)
downloadgit-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