]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit0e66f8722c18194665084e85180bd9f3276f3960
tree8891513fc81ecf6bb5bb1f99e38fb6a621c30853tree | snapshot
parent93446aa760041a5a6f55605d94cdfad7bcd5a2f1commit | diff
parente9fe74cba4ed4577dcc02f61094c611a1c216feecommit | diff
Merge branch 'jk/cherry-pick-root-with-resolve' into maint

* 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
builtin/merge.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.