diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-16 14:08:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-16 14:08:00 -0800 |
| commit | 6c63ab3ca7abc50155acc6c28380435fb79f7fa9 (patch) | |
| tree | 61f4f31ceb45e7be429055e9a34df66ba69d7764 /merge-recursive.c | |
| parent | Merge branch 'mm/empty-loose-error-message' into maint (diff) | |
| parent | commit: ignore intent-to-add entries instead of refusing (diff) | |
| download | git-6c63ab3ca7abc50155acc6c28380435fb79f7fa9.tar.gz git-6c63ab3ca7abc50155acc6c28380435fb79f7fa9.zip | |
Merge branch 'jc/maint-commit-ignore-i-t-a' into maint
* jc/maint-commit-ignore-i-t-a:
commit: ignore intent-to-add entries instead of refusing
Conflicts:
cache-tree.c
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions