From 64491e1ea95acde1aa77db539ba498593a0fcbc5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 13 Feb 2006 00:26:14 -0800 Subject: [PATCH 1/4] Documentation: git-commit in 1.2.X series defaults to --include. The documentation was mistakenly describing the --only semantics to be default. The 1.2.0 release and its maintenance series 1.2.X will keep the traditional --include semantics as the default. Clarify the situation. Signed-off-by: Junio C Hamano --- Documentation/git-commit.txt | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 53b64fa595..5b1b4d3780 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -8,8 +8,8 @@ git-commit - Record your changes SYNOPSIS -------- [verse] -'git-commit' [-a] [-i] [-s] [-v] [(-c | -C) | -F | -m ] - [-e] [--author ] [--] ... +'git-commit' [-a] [-s] [-v] [(-c | -C) | -F | -m ] + [-e] [--author ] [--] [[-i | -o ]...] DESCRIPTION ----------- @@ -73,19 +73,39 @@ OPTIONS commit the whole index. This is the traditional behaviour. ---:: - Do not interpret any more arguments as options. - -...:: +-o|--only:: Commit only the files specified on the command line. This format cannot be used during a merge, nor when the index and the latest commit does not match on the specified paths to avoid confusion. +--:: + Do not interpret any more arguments as options. + +...:: + Files to be committed. The meaning of these is + different between `--include` and `--only`. Without + either, it defaults `--include` semantics. + If you make a commit and then found a mistake immediately after that, you can recover from it with gitlink:git-reset[1]. +WARNING +------- + +The 1.2.0 and its maintenance series 1.2.X will keep the +traditional `--include` semantics as the default when neither +`--only` nor `--include` is specified and `paths...` are given. +This *will* change during the development towards 1.3.0 in the +'master' branch of `git.git` repository. If you are using this +command in your scripts, and you depend on the traditional +`--include` semantics, please update them to explicitly ask for +`--include` semantics. Also if you are used to making partial +commit using `--include` semantics, please train your fingers to +say `git commit --include paths...` (or `git commit -i paths...`). + + Discussion ---------- @@ -101,7 +121,7 @@ even the command is invoked from a subdirectory. That is, update the specified paths to the index and then commit the whole tree. -`git commit paths...` largely bypasses the index file and +`git commit --only paths...` largely bypasses the index file and commits only the changes made to the specified paths. It has however several safety valves to prevent confusion. From 41ac06c7a308bb23c55c066d150754492c2da1b6 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 13 Feb 2006 21:52:10 -0800 Subject: [PATCH 2/4] Documentation: git-ls-files asciidocco. Noticed by Jon Nelson. Signed-off-by: Junio C Hamano --- Documentation/git-ls-files.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 4631c0035dc26ffab3a3832a5d9e9f55245f00f7 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 13 Feb 2006 21:25:38 -0800 Subject: [PATCH 3/4] bisect: remove BISECT_NAMES after done. I noticed that we forgot to clean this file and kept it that way, while trying to help with Andrew's bisect problem. Signed-off-by: Junio C Hamano --- git-bisect.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/git-bisect.sh b/git-bisect.sh index 51e1e4417d..07502536ce 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -172,6 +172,7 @@ bisect_reset() { rm -fr "$GIT_DIR/refs/bisect" rm -f "$GIT_DIR/refs/heads/bisect" rm -f "$GIT_DIR/BISECT_LOG" + rm -f "$GIT_DIR/BISECT_NAMES" } bisect_replay () { From 365463851303f74eb5e5be7101811f215602fcd9 Mon Sep 17 00:00:00 2001 From: Fredrik Kuivinen Date: Tue, 14 Feb 2006 00:15:14 +0100 Subject: [PATCH 4/4] s/SHELL/SHELL_PATH/ in Makefile With the current Makefile we don't use the shell chosen by the platform specific defines when we invoke GIT-VERSION-GEN. Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f240e452b6..d40aa6a7d8 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.