projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b8939b2 d387868)
Merge branch 'jc/maint-merge-autoedit' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 Apr 2012 19:56:35 +0000 (12:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 Apr 2012 19:56:35 +0000 (12:56 -0700)
* jc/maint-merge-autoedit:
  merge: backport GIT_MERGE_AUTOEDIT support


Trivial merge
Git—the stupid content tracker