Merge branch 'jc/combine' into next
* jc/combine: 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. combine-diff: type fix.
Junio C Hamano committed
Apr 12, 2006 at 13:24 UTC
02376287ffd8b37ea7622fd4b61d654855112e75
No changes.