diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-03-04 00:34:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-04 00:34:39 -0800 |
| commit | 27b4070e40a771c41ed581ef1ac98dd43e58ab87 (patch) | |
| tree | 084c3b9f77e5d9e8253a16e6f9baea5d25f77e46 /fast-import.c | |
| parent | t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge (diff) | |
| parent | Fix 'git remote show' regression on empty repository in 1.5.4 (diff) | |
| download | tgif-27b4070e40a771c41ed581ef1ac98dd43e58ab87.tar.xz | |
Merge branch 'maint'
* maint:
Fix 'git remote show' regression on empty repository in 1.5.4
Fix incorrect wording in git-merge.txt.
git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options
Fix random crashes in http_cleanup()
Diffstat (limited to 'fast-import.c')
0 files changed, 0 insertions, 0 deletions