]> Pileus Git - ~andy/git/commitdiff
projects / ~andy / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 241b925 29b6754)
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 23 Feb 2010 22:27:55 +0000 (14:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 Feb 2010 22:27:55 +0000 (14:27 -0800)
* maint:
  am: remove rebase-apply directory before gc
  rerere: fix memory leak if rerere images can't be read
  Documentation: mention conflict marker size argument (%L) for merge driver


Trivial merge
Andy's Git repository