From b515b6a4d0d6c3d14be2f83e9a971495d1f16b30 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 8 Aug 2007 09:21:16 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3-rc4-29-g74276 --- git-commit.html | 14 +++++++++----- git-commit.txt | 1 + git-stash.html | 10 +++++----- git-stash.txt | 8 ++++---- git-status.html | 8 +++++++- git-status.txt | 7 +++++++ 6 files changed, 33 insertions(+), 15 deletions(-) diff --git a/git-commit.html b/git-commit.html index 514f3d1ba..48283c0dd 100644 --- a/git-commit.html +++ b/git-commit.html @@ -282,13 +282,17 @@ git-commit(1) Manual Page

Use git commit to store the current contents of the index in a new commit along with a log message describing the changes you have made.

-

The content to be added can be specified in several ways: -1. by using git-add(1) to incrementally "add" changes to the - index before using the commit command (Note: even modified - files must be "added");

+

The content to be added can be specified in several ways:

  1. +by using git-add(1) to incrementally "add" changes to the + index before using the commit command (Note: even modified + files must be "added"); +

    +
    2. +
  2. +

    by using git-rm(1) to remove files from the working tree and the index, again before using the commit command;

    @@ -697,7 +701,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-commit.txt b/git-commit.txt index 63599d382..e54fb1210 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -19,6 +19,7 @@ Use 'git commit' to store the current contents of the index in a new commit along with a log message describing the changes you have made. The content to be added can be specified in several ways: + 1. by using gitlink:git-add[1] to incrementally "add" changes to the index before using the 'commit' command (Note: even modified files must be "added"); diff --git a/git-stash.html b/git-stash.html index fceecdd72..ec8f78fcc 100644 --- a/git-stash.html +++ b/git-stash.html @@ -291,8 +291,8 @@ you can give a more descriptive message on the command line when you create one.

The latest stash you created is stored in $GIT_DIR/refs/stash; older stashes are found in the reflog of this reference and can be named using -the usual reflog syntax (e.g. stash@{1} is the most recently -created stash, stash@{2} is the one before it, stash@{2.hours.ago} +the usual reflog syntax (e.g. stash@{0} is the most recently +created stash, stash@{1} is the one before it, stash@{2.hours.ago} is also possible).

OPTIONS

@@ -314,7 +314,7 @@ list

List the stashes that you currently have. Each stash is listed - with its name (e.g. stash@{0} is the latest stash, `stash@{1} is + with its name (e.g. stash@{0} is the latest stash, stash@{1} is the one before, etc.), the name of the branch that was current when the stash was made, and a short description of the commit the stash was based on. @@ -334,7 +334,7 @@ show [<stash>] stashed state and its original parent. When no <stash> is given, shows the latest one. By default, the command shows the diffstat, but it will accept any format known to git-diff (e.g., git-stash show - -p stash@{2} to view the second most recent stash in patch form). + -p stash@{1} to view the second most recent stash in patch form).

@@ -456,7 +456,7 @@ $ git stash apply diff --git a/git-stash.txt b/git-stash.txt index 17121ade5..05f40cff6 100644 --- a/git-stash.txt +++ b/git-stash.txt @@ -29,8 +29,8 @@ you create one. The latest stash you created is stored in `$GIT_DIR/refs/stash`; older stashes are found in the reflog of this reference and can be named using -the usual reflog syntax (e.g. `stash@\{1}` is the most recently -created stash, `stash@\{2}` is the one before it, `stash@\{2.hours.ago}` +the usual reflog syntax (e.g. `stash@\{0}` is the most recently +created stash, `stash@\{1}` is the one before it, `stash@\{2.hours.ago}` is also possible). OPTIONS @@ -45,7 +45,7 @@ save:: list:: List the stashes that you currently have. Each 'stash' is listed - with its name (e.g. `stash@\{0}` is the latest stash, `stash@\{1} is + with its name (e.g. `stash@\{0}` is the latest stash, `stash@\{1}` is the one before, etc.), the name of the branch that was current when the stash was made, and a short description of the commit the stash was based on. @@ -61,7 +61,7 @@ show []:: stashed state and its original parent. When no `` is given, shows the latest one. By default, the command shows the diffstat, but it will accept any format known to `git-diff` (e.g., `git-stash show - -p stash@\{2}` to view the second most recent stash in patch form). + -p stash@\{1}` to view the second most recent stash in patch form). apply []:: diff --git a/git-status.html b/git-status.html index 51401ccd8..821aa2b24 100644 --- a/git-status.html +++ b/git-status.html @@ -288,6 +288,12 @@ status.

The command takes the same set of options as git-commit; it shows what would be committed if the same options are given to git-commit.

+

If any paths have been touched in the working tree (that is, +their modification times have changed) but their contents and +permissions are identical to those in the index file, the command +updates the index file. Running git-status can thus speed up +subsequent operations such as git-diff if the working tree +contains many paths that have been touched but not modified.

OUTPUT

@@ -320,7 +326,7 @@ Junio C Hamano <junkio@cox.net>.

diff --git a/git-status.txt b/git-status.txt index 6f16eb032..8fd0fc623 100644 --- a/git-status.txt +++ b/git-status.txt @@ -27,6 +27,13 @@ The command takes the same set of options as `git-commit`; it shows what would be committed if the same options are given to `git-commit`. +If any paths have been touched in the working tree (that is, +their modification times have changed) but their contents and +permissions are identical to those in the index file, the command +updates the index file. Running `git-status` can thus speed up +subsequent operations such as `git-diff` if the working tree +contains many paths that have been touched but not modified. + OUTPUT ------ -- 2.26.2