Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Dec 2010 00:41:13 +0000 (1 16:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Dec 2010 00:41:13 +0000 (1 16:41 -0800)
* maint:
  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
builtin/add.c
contrib/completion/git-completion.bash

Simple merge
diff --cc builtin/add.c
Simple merge