projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e2e4aed e9fe74c)
Merge branch 'jk/cherry-pick-root-with-resolve'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2011 03:37:19 +0000 (20:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2011 03:37:19 +0000 (20:37 -0700)
commit6699c959efccc7cb969b87bdf8e0154a0fe9ccc8
tree96b536942f08c30e8d5f9f7dc6ec950ddd67f0e3tree | snapshot
parente2e4aed5defb2df8dbd523613ff4ef46050abb07commit | diff
parente9fe74cba4ed4577dcc02f61094c611a1c216feecommit | diff
Merge branch 'jk/cherry-pick-root-with-resolve'

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