Merge some proposed fixes

Junio C Hamano · Junio C Hamano · commit 6a9b87972f27 · 2006-02-13T23:34:58.000-08:00
Conflicts:

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

Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git 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
@@ -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
@@ -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 () {

Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,7 @@ bisect_reset() {`
`183`	`183`	`rm -fr "$GIT_DIR/refs/bisect"`
`184`	`184`	`rm -f "$GIT_DIR/refs/heads/bisect" "$GIT_DIR/head-name"`
`185`	`185`	`rm -f "$GIT_DIR/BISECT_LOG"`
	`186`	`+ rm -f "$GIT_DIR/BISECT_NAMES"`
`186`	`187`	`}`
`187`	`188`
`188`	`189`	`bisect_replay () {`