summaryrefslogtreecommitdiff
path: root/Documentation/git-commit.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-13 07:55:07 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-13 07:55:07 (GMT)
commit4170a19587280eeb3663a47a6fd993910de78076 (patch)
tree8dbb8b720df881ff961cd01a9b531650b457754c /Documentation/git-commit.txt
parentbd9ca0baff88107e26915cdaaf9821dc70a187e3 (diff)
downloadgit-4170a19587280eeb3663a47a6fd993910de78076.zip
git-4170a19587280eeb3663a47a6fd993910de78076.tar.gz
git-4170a19587280eeb3663a47a6fd993910de78076.tar.bz2
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>
Diffstat (limited to 'Documentation/git-commit.txt')
-rw-r--r--Documentation/git-commit.txt17
1 files changed, 11 insertions, 6 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 53b64fa..214ed23 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].