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 /log-tree.h | |
| parent | 4947cf9cc377b15006f3e649c59edf9bc813af6f (diff) | |
| parent | 52dce39762fbec75b2d561e5dedb25b8e51f83eb (diff) | |
| download | git-27b4070e40a771c41ed581ef1ac98dd43e58ab87.tar.gz | |
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 'log-tree.h')
0 files changed, 0 insertions, 0 deletions