diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-12 23:55:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-12 23:55:07 -0800 |
| commit | 4170a19587280eeb3663a47a6fd993910de78076 (patch) | |
| tree | 8dbb8b720df881ff961cd01a9b531650b457754c | |
| parent | bd9ca0baff88107e26915cdaaf9821dc70a187e3 (diff) | |
| download | git-4170a19587280eeb3663a47a6fd993910de78076.tar.gz | |
git-commit: Now --only semantics is the default.
This changes the "git commit paths..." to default to --only
semantics from traditional --include semantics, as agreed on the
list.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/git-commit.txt | 17 | ||||
| -rwxr-xr-x | git-commit.sh | 9 |
2 files changed, 14 insertions, 12 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 53b64fa595..214ed235c5 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) <commit> | -F <file> | -m <msg>] - [-e] [--author <author>] [--] <file>... +'git-commit' [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>] + [-e] [--author <author>] [--] [[-i | -o ]<file>...] DESCRIPTION ----------- @@ -73,15 +73,20 @@ OPTIONS commit the whole index. This is the traditional behaviour. ---:: - Do not interpret any more arguments as options. - -<file>...:: +-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. + +<file>...:: + Files to be committed. The meaning of these is + different between `--include` and `--only`. Without + either, it defaults `--only` semantics. + If you make a commit and then found a mistake immediately after that, you can recover from it with gitlink:git-reset[1]. diff --git a/git-commit.sh b/git-commit.sh index 59551d99f9..ab5e6bc1c8 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -3,7 +3,7 @@ # Copyright (c) 2005 Linus Torvalds # Copyright (c) 2006 Junio C Hamano -USAGE='[-a] [-i] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit>] [-e] [--author <author>] [<path>...]' +USAGE='[-a] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit>] [-e] [--author <author>] [[-i | -o] <path>...]' SUBDIRECTORY_OK=Yes . git-sh-setup @@ -340,11 +340,8 @@ case "$#,$also$only" in 0,) ;; *,) - echo >&2 "assuming --include paths..." - also=t - # Later when switch the defaults, we will replace them with these: - # echo >&2 "assuming --only paths..." - # also= + echo >&2 "assuming --only paths..." + also= # If we are going to launch an editor, the message won't be # shown without this... |