Junio C Hamano cc5aa89fd6 Merge branch 'jc/read-tree-ignore' into next ...

* jc/read-tree-ignore:
  read-tree: document --exclude-per-directory
  Loosen "working file will be lost" check in Porcelain-ish
  read-tree: further loosen "working file will be lost" check.

Conflicts:

	git-merge.sh

2006-12-05 23:49:37 -08:00

5.7 KiB

Executable File

Raw Blame History

View Raw