projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 72c159f 3103c00)
Merge branch 'jc/combine' into next
authorJunio C Hamano <junkio@cox.net>
Wed, 12 Apr 2006 20:24:48 +0000 (13:24 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 12 Apr 2006 20:24:48 +0000 (13:24 -0700)
commit02376287ffd8b37ea7622fd4b61d654855112e75
tree012240009f9afed51301c938dae22c95ce3e72c7tree | snapshot
parent72c159f642a33255b76fff512f2a8c3aff9f5dcacommit | diff
parent3103c005207f0840782804b9387b3a831005bb9ccommit | diff
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.
combine-diff.c diff1 | diff2 | blob | history
The core git plumbing