Merge branch 'master'
authorJunio C Hamano <junkio@cox.net>
Tue, 14 Feb 2006 07:44:41 +0000 (23:44 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 14 Feb 2006 07:44:41 +0000 (23:44 -0800)
* 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'

Documentation/git-ls-files.txt
Makefile
git-bisect.sh
index e5a92f47dd086d3db2a7248673816998311b3f12..fe8ac1b0e5bf2cd036a4a241fb3812506a99d95c 100644 (file)
@@ -81,7 +81,7 @@ OPTIONS
        R::     removed/deleted
        C::     modified/changed
        K::     to be killed
-       ?       other
+       ?::     other
 
 -v::
        Similar to `-t`, but use lowercase letters for files
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.
index 3c024aae73430f1927e65c925135d3030cb43f10..03df1433ef12014584f23f16e65124c219c2f466 100755 (executable)
@@ -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 () {