From: Junio C Hamano <junkio@cox.net>
Date: Tue, 14 Feb 2006 07:34:58 +0000 (-0800)
Subject: Merge some proposed fixes
X-Git-Tag: v1.3.0-rc1~215
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6a9b87972f27edfe53da4ce016adf4c0cd42f5e6;p=git.git

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>
---

6a9b87972f27edfe53da4ce016adf4c0cd42f5e6
diff --cc git-bisect.sh
index 3c024aae7,07502536c..03df1433e
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@@ -181,8 -170,9 +181,9 @@@ bisect_reset() 
  	esac
  	git checkout "$branch" &&
  	rm -fr "$GIT_DIR/refs/bisect"
 -	rm -f "$GIT_DIR/refs/heads/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 () {