Andrew's git / gitweb.git / diff
?
Merge branch 'maint-1.7.2' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Dec 2010 00:40:26 +0000 (16:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Dec 2010 00:40:26 +0000 (16:40 -0800)
* maint-1.7.2:
add: introduce add.ignoreerrors synonym for add.ignore-errors
bash: Match lightweight tags in prompt
git-commit.txt: (synopsis): move -i and -o before "--"

1  2 
Documentation/config.txt patch | diff1 | diff2 | blob | history
contrib/completion/git-completion.bash patch | diff1 | diff2 | blob | history
diff --cc Documentation/config.txt
Simple merge
diff --cc contrib/completion/git-completion.bash
Simple merge