From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Dec 2010 00:42:22 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: ko-next~108
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8b3da136101fd4d712ce67c2928913f99ef759c3;p=git.git

Merge branch 'master' into next

* master:
  add: introduce add.ignoreerrors synonym for add.ignore-errors
  commit.c: Remove backward goto in read_craft_line()
  bash: Match lightweight tags in prompt
  git-commit.txt: (synopsis): move -i and -o before "--"

Conflicts:
	Documentation/git-commit.txt
---

8b3da136101fd4d712ce67c2928913f99ef759c3
diff --cc Documentation/git-commit.txt
index 6e4c220f2,ec7b577b8..b586c0f44
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@@ -9,10 -9,10 +9,10 @@@ SYNOPSI
  --------
  [verse]
  'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend] [--dry-run]
 -	   [(-c | -C) <commit>] [-F <file> | -m <msg>] [--reset-author]
 -	   [--allow-empty] [--allow-empty-message] [--no-verify] [-e] [--author=<author>]
 -	   [--date=<date>] [--cleanup=<mode>] [--status | --no-status]
 -	   [-i | -o] [--] [<file>...]
 +	   [(-c | -C | --fixup | --squash) <commit>] [-F <file> | -m <msg>]
 +	   [--reset-author] [--allow-empty] [--allow-empty-message] [--no-verify]
 +	   [-e] [--author=<author>] [--date=<date>] [--cleanup=<mode>]
- 	   [--status | --no-status] [--] [[-i | -o ]<file>...]
++	   [--status | --no-status] [-i | -o] [--] [<file>...]
  
  DESCRIPTION
  -----------