undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master'

Browse Source 
* 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'
This commit is contained in:
Junio C Hamano 2006-02-13 23:44:41 -08:00
commit 65520c8e50
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

@ -81,7 +81,7 @@ OPTIONS
R:: removed/deleted R:: removed/deleted
C:: modified/changed C:: modified/changed
K:: to be killed K:: to be killed
? other ?:: other
-v:: -v::
Similar to `-t`, but use lowercase letters for files Similar to `-t`, but use lowercase letters for files

2
Makefile
View File

@ -67,7 +67,7 @@ all:
# change being considered an inode change from the update-cache perspective. # change being considered an inode change from the update-cache perspective.
GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
@$(SHELL) ./GIT-VERSION-GEN @$(SHELL_PATH) ./GIT-VERSION-GEN
-include GIT-VERSION-FILE -include GIT-VERSION-FILE
# CFLAGS and LDFLAGS are for the users to override from the command line. # 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 -fr "$GIT_DIR/refs/bisect"
rm -f "$GIT_DIR/refs/heads/bisect" "$GIT_DIR/head-name" rm -f "$GIT_DIR/refs/heads/bisect" "$GIT_DIR/head-name"
rm -f "$GIT_DIR/BISECT_LOG" rm -f "$GIT_DIR/BISECT_LOG"
rm -f "$GIT_DIR/BISECT_NAMES"
} }
bisect_replay () { bisect_replay () {