summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-14 07:34:58 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-14 07:34:58 (GMT)
commit6a9b87972f27edfe53da4ce016adf4c0cd42f5e6 (patch)
tree8bf0c7f24c13ab2cd0e401ef1b609d30486606e9
parent057f98eda179491c3f32c556f523e8786c2cbab5 (diff)
parent365463851303f74eb5e5be7101811f215602fcd9 (diff)
downloadgit-6a9b87972f27edfe53da4ce016adf4c0cd42f5e6.zip
git-6a9b87972f27edfe53da4ce016adf4c0cd42f5e6.tar.gz
git-6a9b87972f27edfe53da4ce016adf4c0cd42f5e6.tar.bz2
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>
-rw-r--r--Documentation/git-ls-files.txt2
-rw-r--r--Makefile2
-rwxr-xr-xgit-bisect.sh1
3 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index e433407..fe53412 100644
--- 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 f240e45..d40aa6a 100644
--- 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 3c024aa..03df143 100755
--- 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 () {