diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-06-12 07:27:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-12 07:27:50 -0700 |
| commit | 87725757af66f3dd6c4141ebe3e410cb6f2e7210 (patch) | |
| tree | e265fdd5e61d7849b1204f4f44af18a6c91ccf2f /Documentation/git-merge.txt | |
| parent | git-svn: use YAML format for mergeinfo cache when possible (diff) | |
| parent | fast-export: report SHA-1 instead of gibberish when marks exist already (diff) | |
| download | tgif-87725757af66f3dd6c4141ebe3e410cb6f2e7210.tar.xz | |
Merge branch 'js/maint-fast-export-mark-error'
* js/maint-fast-export-mark-error:
fast-export: report SHA-1 instead of gibberish when marks exist already
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions