development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-03 23:29:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge some proposed fixes

Browse source 
Conflicts:

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

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-02-13 23:34:58 -08:00
parent 057f98eda1 3654638513
commit 6a9b87972f
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/git-ls-files.txt
View file

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

2
Makefile
View file

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

1
git-bisect.sh
View file

@ -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 () {