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 /Documentation/howto | |
| parent | Merge branch 'an/diff-index-doc' (diff) | |
| parent | Documentation/merge-options.txt: restore `-e` option (diff) | |
| download | tgif-499eaceb217df573fb3698d7a52e3e5a9b4173bc.tar.xz | |
Merge branch 'rh/merge-options-doc-fix'
* rh/merge-options-doc-fix:
Documentation/merge-options.txt: restore `-e` option
Diffstat (limited to 'Documentation/howto')
0 files changed, 0 insertions, 0 deletions