![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 12 Apr 2006 20:24:04 +0000 (13:24 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 12 Apr 2006 20:24:04 +0000 (13:24 -0700) | ||
| commit | 3103c005207f0840782804b9387b3a831005bb9c | |
| tree | 51d1c31f842c5f56e3dd42eeb9ca0980e716853c | tree | snapshot |
| parent | 8bc7574b6332ef45645c6e0917e9d59919b277ef | commit | diff |
| parent | f4ee3eb68906f079dea45de4f1bbb03d68189eb3 | commit | diff |
Merge branch 'master' into jc/combine
* master:
stripspace: make sure not to leave an incomplete line.
git-commit: do not muck with commit message when no_edit is set.
When showing a commit message, do not lose an incomplete line.
Retire t5501-old-fetch-and-upload test.
* master:
stripspace: make sure not to leave an incomplete line.
git-commit: do not muck with commit message when no_edit is set.
When showing a commit message, do not lose an incomplete line.
Retire t5501-old-fetch-and-upload test.