From: Junio C Hamano <junkio@cox.net>
Date: Tue, 14 Feb 2006 07:44:41 +0000 (-0800)
Subject: Merge branch 'master'
X-Git-Tag: v1.3.0-rc1~54^2~74
X-Git-Url: https://git.octo.it/?p=git.git;a=commitdiff_plain;h=65520c8e50ec227bc72e4196de03f785f850e5ad

Merge branch 'master'

* master:
  Merge some proposed fixes
  s/SHELL/SHELL_PATH/ in Makefile
  bisect: remove BISECT_NAMES after done.
  Documentation: git-ls-files asciidocco.
  Documentation: git-commit in 1.2.X series defaults to --include.
  Merge branch 'pb/bisect'
---

65520c8e50ec227bc72e4196de03f785f850e5ad
diff --cc Documentation/git-ls-files.txt
index e5a92f47,fe534129..fe8ac1b0
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@@ -81,12 -80,8 +81,12 @@@ OPTION
  	R::	removed/deleted
  	C::	modified/changed
  	K::	to be killed
- 	?	other
+ 	?::	other
  
 +-v::
 +	Similar to `-t`, but use lowercase letters for files
 +	that are marked as 'always matching index'.
 +
  --full-name::
  	When run from a subdirectory, the command usually
  	outputs paths relative to the current directory.  This