]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'js/rerere'
authorJunio C Hamano <junkio@cox.net>
Sun, 24 Dec 2006 10:10:55 +0000 (02:10 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 24 Dec 2006 10:10:55 +0000 (02:10 -0800)
commit9def2138a17325c68961c3b1e6c967d33f28a4f1
treeace1cf9adca0334eade813cd1b41acf8422f7efc
parent9e83266525aad5c6210b9a21be9b1c6996d5544f
parent658f3650273abd6888c964b9fb1291c603306df8
Merge branch 'js/rerere'

* js/rerere:
  Make git-rerere a builtin
  Add a test for git-rerere
  move read_mmfile() into xdiff-interface
Makefile
git.c