From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Dec 2010 00:40:26 +0000 (-0800)
Subject: Merge branch 'maint-1.7.2' into maint
X-Git-Tag: v1.7.3.3~11
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5501bf854ce6a3847ef0de6f6aa63f6b93e82b67;p=git.git

Merge branch 'maint-1.7.2' into maint

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

5501bf854ce6a3847ef0de6f6aa63f6b93e82b67