projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 93446aa e9fe74c)
Merge branch 'jk/cherry-pick-root-with-resolve' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 16:37:41 +0000 (09:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 16:37:41 +0000 (09:37 -0700)
* jk/cherry-pick-root-with-resolve:
  t3503: test cherry picking and reverting root commits
  revert: allow reverting a root commit
  cherry-pick: handle root commits with external strategies

1  2 
builtin/merge.c patch | diff1 | diff2 | blob | history

diff --cc builtin/merge.c
Simple merge
Git—the stupid content tracker