projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d63afe9 c175161)
Merge branch 'jc/merge'
authorJunio C Hamano <junkio@cox.net>
Mon, 27 Nov 2006 06:19:56 +0000 (22:19 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 27 Nov 2006 06:19:56 +0000 (22:19 -0800)
commit88ffc1f28a8b86969c7cbc54b0e3279d8cfe90a8
tree3c461861be7704f2701c69ae006d1bc1d1e74bf4tree | snapshot
parentd63afe9ebb9b27952d3c29215a246b252f2d80f9commit | diff
parentc1751616381b6e8c8eae311107b5969a0233a6d8commit | diff
Merge branch 'jc/merge'

* branch 'jc/merge':
  git-merge: do not leak rev-parse output used for checking internally.
  git-merge: tighten error checking.
  merge: allow merging into a yet-to-be-born branch.
  git-merge: make it usable as the first class UI
  remove merge-recursive-old
Git—the stupid content tracker