From: Junio C Hamano Date: Mon, 1 Oct 2007 16:23:20 +0000 (+0000) Subject: Autogenerated manpages for v1.5.3.3-131-g34c6d X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b77d4f30a076aa7376beeb4656f08ca6ab83aef9;p=git.git Autogenerated manpages for v1.5.3.3-131-g34c6d --- diff --git a/man1/git-stash.1 b/man1/git-stash.1 index cad88e33b..15b5afac6 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" "08/08/2007" "Git 1.5.3.rc4.29.g74276" "Git Manual" +.TH "GIT\-STASH" "1" "10/01/2007" "Git 1.5.3.3.131.g34c6d" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -40,10 +40,12 @@ stash@{1}: On master: 9cc0589... Add git\-stash 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@{1} to view the second most recent stash in patch form). .TP -apply [] +apply [\-\-index] [] 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. This operation can fail with conflicts; you need to resolve them by hand in the working tree. + +If the \-\-index option is used, then tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally). .TP clear Remove all the stashed states. Note that those states will then be subject to pruning, and may be difficult or impossible to recover. diff --git a/man7/git.7 b/man7/git.7 index f60e11abf..c3c46ce01 100644 --- a/man7/git.7 +++ b/man7/git.7 @@ -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" "7" "09/26/2007" "Git 1.5.3.2.111.g5166" "Git Manual" +.TH "GIT" "7" "10/01/2007" "Git 1.5.3.3.131.g34c6d" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only)