From: Junio C Hamano Date: Wed, 8 Aug 2007 09:21:17 +0000 (+0000) Subject: Autogenerated manpages for v1.5.3-rc4-29-g74276 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8b9c4d80c5322d04a5951a957202032a1d941b99;p=git.git Autogenerated manpages for v1.5.3-rc4-29-g74276 --- diff --git a/man1/git-commit.1 b/man1/git-commit.1 index a3c48344f..877065702 100644 --- a/man1/git-commit.1 +++ b/man1/git-commit.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-COMMIT" "1" "08/06/2007" "Git 1.5.3.rc4.16.ga76c" "Git Manual" +.TH "GIT\-COMMIT" "1" "08/08/2007" "Git 1.5.3.rc4.29.g74276" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -20,18 +20,21 @@ git\-commit \- Record changes to the repository .SH "DESCRIPTION" Use \fIgit commit\fR 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 \fBgit\-add\fR(1) to incrementally "add" changes to the index before using the \fIcommit\fR command (Note: even modified files must be "added"); +The content to be added can be specified in several ways: .TP 3 1. -by using \fBgit\-rm\fR(1) to remove files from the working tree and the index, again before using the \fIcommit\fR command; +by using \fBgit\-add\fR(1) to incrementally "add" changes to the index before using the \fIcommit\fR command (Note: even modified files must be "added"); .TP 2. -by listing files as arguments to the \fIcommit\fR command, in which case the commit will ignore changes staged in the index, and instead record the current content of the listed files; +by using \fBgit\-rm\fR(1) to remove files from the working tree and the index, again before using the \fIcommit\fR command; .TP 3. -by using the \-a switch with the \fIcommit\fR command to automatically "add" changes from all known files (i.e. all files that are already listed in the index) and to automatically "rm" files in the index that have been removed from the working tree, and then perform the actual commit; +by listing files as arguments to the \fIcommit\fR command, in which case the commit will ignore changes staged in the index, and instead record the current content of the listed files; .TP 4. +by using the \-a switch with the \fIcommit\fR command to automatically "add" changes from all known files (i.e. all files that are already listed in the index) and to automatically "rm" files in the index that have been removed from the working tree, and then perform the actual commit; +.TP +5. by using the \-\-interactive switch with the \fIcommit\fR command to decide one by one which files should be part of the commit, before finalizing the operation. Currently, this is done by invoking git\-add \-\-interactive. The \fBgit\-status\fR(1) command can be used to obtain a summary of what is included by any of the above for the next commit by giving the same set of parameters you would give to this command. diff --git a/man1/git-stash.1 b/man1/git-stash.1 index a4cd95862..cad88e33b 100644 --- a/man1/git-stash.1 +++ b/man1/git-stash.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-STASH" "1" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual" +.TH "GIT\-STASH" "1" "08/08/2007" "Git 1.5.3.rc4.29.g74276" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -20,14 +20,14 @@ Use \fIgit\-stash\fR when you want to record the current state of the working di The modifications stashed away by this command can be listed with git\-stash list, inspected with git\-stash show, and restored (potentially on top of a different commit) with git\-stash apply. Calling git\-stash without any arguments is equivalent to git\-stash save. A stash is by default listed as "WIP on \fIbranchname\fR \&...", but 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} is also possible). +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@{0} is the most recently created stash, stash@{1} is the one before it, stash@{2.hours.ago} is also possible). .SH "OPTIONS" .TP save Save your local modifications to a new \fIstash\fR, and run git\-reset \-\-hard to revert them. This is the default action when no subcommand is given. .TP list -List the stashes that you currently have. Each \fIstash\fR is listed 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. +List the stashes that you currently have. Each \fIstash\fR is listed 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. .sp .nf .ft C @@ -38,7 +38,7 @@ stash@{1}: On master: 9cc0589... Add git\-stash .fi .TP show [] -Show the changes recorded in the stash as a diff between the the 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). +Show the changes recorded in the stash as a diff between the the 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@{1} to view the second most recent stash in patch form). .TP apply [] Restore the changes recorded in the stash on top of the current working tree state. When no is given, applies the latest one. The working directory must match the index. diff --git a/man1/git-status.1 b/man1/git-status.1 index d398fe49a..1c1bdfe23 100644 --- a/man1/git-status.1 +++ b/man1/git-status.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-STATUS" "1" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual" +.TH "GIT\-STATUS" "1" "08/08/2007" "Git 1.5.3.rc4.29.g74276" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -17,6 +17,8 @@ Examines paths in the working tree that has changes unrecorded to the index file If there is no path that is different between the index file and the current HEAD commit, the command exits with non\-zero 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. .SH "OUTPUT" The output from this command is designed to be used as a commit template comments, and all the output lines are prefixed with \fI#\fR. .SH "CONFIGURATION"