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'

diff --cc Documentation/git-ls-files.txt
index e5a92f47dd086d3db2a7248673816998311b3f12,fe5341295c55af55d521454ac5ae98b225f1eb32..fe8ac1b0e5bf2cd036a4a241fb3812506a99d95c
--- 1/Documentation/git-ls-files.txt
--- 2/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