diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-03 15:36:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-03 15:36:30 -0700 |
| commit | 15afe9596c101d00085830c54fdc4c4ad0b7193e (patch) | |
| tree | 355012e6a3d7a8b3c1c69b3f1ae2c1708ba4dbb0 /commit.c | |
| parent | Merge branch 'an/diff-index-doc' into maint (diff) | |
| parent | Documentation/merge-options.txt: restore `-e` option (diff) | |
| download | git-15afe9596c101d00085830c54fdc4c4ad0b7193e.tar.gz git-15afe9596c101d00085830c54fdc4c4ad0b7193e.zip | |
Merge branch 'rh/merge-options-doc-fix' into maint
* rh/merge-options-doc-fix:
Documentation/merge-options.txt: restore `-e` option
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions