From: Junio C Hamano <junkio@cox.net>
Date: Wed, 12 Apr 2006 20:24:04 +0000 (-0700)
Subject: Merge branch 'master' into jc/combine
X-Git-Tag: v1.3.0-rc4~16^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3103c005207f0840782804b9387b3a831005bb9c;p=git.git

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.
---

3103c005207f0840782804b9387b3a831005bb9c