Merge some proposed fixes

Conflicts:

Documentation/git-commit.txt - taking the post 1.2.0 semantics.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index e433407a4e1676c15d0a3c2016b8f4e034d54c32..fe5341295c55af55d521454ac5ae98b225f1eb32 100644 (file)
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -80,7 +80,7 @@ OPTIONS
        R::     removed/deleted
        C::     modified/changed
        K::     to be killed
-       ?       other
+       ?::     other
 
 --full-name::
        When run from a subdirectory, the command usually

diff --git a/Makefile b/Makefile
index f240e452b688dc03834eeb393a0249754363b27b..d40aa6a7d8cef4dd36a16e88071faf37c16fb731 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,7 @@ all:
 # change being considered an inode change from the update-cache perspective.
 
 GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
-       @$(SHELL) ./GIT-VERSION-GEN
+       @$(SHELL_PATH) ./GIT-VERSION-GEN
 -include GIT-VERSION-FILE
 
 # CFLAGS and LDFLAGS are for the users to override from the command line.

diff --git a/git-bisect.sh b/git-bisect.sh
index 3c024aae73430f1927e65c925135d3030cb43f10..03df1433ef12014584f23f16e65124c219c2f466 100755 (executable)
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -183,6 +183,7 @@ bisect_reset() {
        rm -fr "$GIT_DIR/refs/bisect"
        rm -f "$GIT_DIR/refs/heads/bisect" "$GIT_DIR/head-name"
        rm -f "$GIT_DIR/BISECT_LOG"
+       rm -f "$GIT_DIR/BISECT_NAMES"
 }
 
 bisect_replay () {