From: Junio C Hamano Date: Tue, 14 Feb 2006 08:00:23 +0000 (+0000) Subject: Autogenerated HTML docs for v1.2.0-g6a9b X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=6697ac5ece27196e05dc8715c4af49217d4a6375;p=git.git Autogenerated HTML docs for v1.2.0-g6a9b --- diff --git a/git-commit.html b/git-commit.html index f391cfff..4965cb9e 100644 --- a/git-commit.html +++ b/git-commit.html @@ -273,8 +273,8 @@ git-commit(1) Manual Page

SYNOPSIS

-
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

@@ -389,6 +389,17 @@ information.

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

+
+
—
@@ -401,10 +412,9 @@ information.

- 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. + Files to be committed. The meaning of these is + different between --include and --only. Without + either, it defaults --only semantics.

@@ -470,7 +480,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-commit.txt b/git-commit.txt index 53b64fa5..214ed235 100644 --- a/git-commit.txt +++ b/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,15 +73,20 @@ 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 `--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-ls-files.html b/git-ls-files.html index 3e5443b8..129ef2b0 100644 --- a/git-ls-files.html +++ b/git-ls-files.html @@ -3,7 +3,7 @@ - +