Junio C Hamano 8b3da13610 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

2010-12-01 16:42:22 -08:00

20 KiB

Raw Blame History

View Raw