projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b46f7e5 aa1a011)
Merge branch 'am/cherry-pick-rerere'
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Aug 2008 23:40:09 +0000 (16:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Aug 2008 23:40:09 +0000 (16:40 -0700)
* am/cherry-pick-rerere:
  Make cherry-pick use rerere for conflict resolution.


Trivial merge
Git—the stupid content tracker