![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 16 Apr 2008 07:37:33 +0000 (00:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 16 Apr 2008 07:37:33 +0000 (00:37 -0700) | ||
| commit | 464509f790f409d95e0820364ef7296d82942d8c | |
| tree | 5825102bb17963d3890c487d88f6d69703620947 | tree | snapshot |
| parent | 2b6f0b0a78a713be51149f27c2c1172fe4afc9cd | commit | diff |
| parent | d3e54c88291c2d880ff3a72167c5d3159aed8e97 | commit | diff |
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4:
git-bisect: make "start", "good" and "skip" succeed or fail atomically
git-am: cope better with an empty Subject: line
Ignore leading empty lines while summarizing merges
bisect: squelch "fatal: ref HEAD not a symref" misleading message
builtin-apply: Show a more descriptive error on failure when opening a patch
Clarify documentation of git-cvsserver, particularly in relation to git-shell
* maint-1.5.4:
git-bisect: make "start", "good" and "skip" succeed or fail atomically
git-am: cope better with an empty Subject: line
Ignore leading empty lines while summarizing merges
bisect: squelch "fatal: ref HEAD not a symref" misleading message
builtin-apply: Show a more descriptive error on failure when opening a patch
Clarify documentation of git-cvsserver, particularly in relation to git-shell
| Documentation/git-cvsserver.txt | diff1 | | diff2 | | blob | history |
| builtin-apply.c | diff1 | | diff2 | | blob | history |
| builtin-fmt-merge-msg.c | diff1 | | diff2 | | blob | history |
| git-am.sh | diff1 | | diff2 | | blob | history |
| git-bisect.sh | diff1 | | diff2 | | blob | history |
| t/t6030-bisect-porcelain.sh | diff1 | | diff2 | | blob | history |