diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-02-13 23:34:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-13 23:34:58 -0800 |
| commit | 6a9b87972f27edfe53da4ce016adf4c0cd42f5e6 (patch) | |
| tree | 8bf0c7f24c13ab2cd0e401ef1b609d30486606e9 | |
| parent | Merge branch 'pb/bisect' (diff) | |
| parent | s/SHELL/SHELL_PATH/ in Makefile (diff) | |
| download | tgif-6a9b87972f27edfe53da4ce016adf4c0cd42f5e6.tar.xz | |
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.txt | 2 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | git-bisect.sh | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index e433407a4e..fe5341295c 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 @@ -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 3c024aae73..03df1433ef 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 () { |