From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Dec 2010 00:41:13 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.4-rc0~98
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=94fdb6f6ebcfe2842e8648dd88389e2e850723e9;p=thirdparty%2Fgit.git

Merge branch 'maint'

* 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 "--"
---

94fdb6f6ebcfe2842e8648dd88389e2e850723e9