diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-04-07 16:37:13 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-04-07 16:37:13 -0700 |
commit | 63b6fdb8e5cadbb9ad619d06dcaf4a3b72c7d359 (patch) | |
tree | 3bd76390d32ef6ce9b0ad358241fe0b2e45e3588 /git-commit.html | |
parent | edf80bdff8acc2ba55267b047475925e8ee8c486 (diff) | |
download | git-htmldocs-63b6fdb8e5cadbb9ad619d06dcaf4a3b72c7d359.tar.gz |
Autogenerated HTML docs for v1.8.2.1-339-g52a3e
Diffstat (limited to 'git-commit.html')
-rw-r--r-- | git-commit.html | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/git-commit.html b/git-commit.html index 1c2a5ed33..28eb6f9fc 100644 --- a/git-commit.html +++ b/git-commit.html @@ -1136,14 +1136,15 @@ variable (see <a href="git-config.html">git-config(1)</a>).</p></div> </dt>
<dd>
<p>
- Used to amend the tip of the current branch. Prepare the tree
- object you would want to replace the latest commit as usual
- (this includes the usual -i/-o and explicit paths), and the
- commit log editor is seeded with the commit message from the
- tip of the current branch. The commit you create replaces the
- current tip — if it was a merge, it will have the parents of
- the current tip as parents — so the current top commit is
- discarded.
+ Replace the tip of the current branch by creating a new
+ commit. The recorded tree is prepared as usual (including
+ the effect of the <code>-i</code> and <code>-o</code> options and explicit
+ pathspec), and the message from the original commit is used
+ as the starting point, instead of an empty message, when no
+ other message is specified from the command line via options
+ such as <code>-m</code>, <code>-F</code>, <code>-c</code>, etc. The new commit has the same
+ parents and author as the current one (the <code>--reset-author</code>
+ option can countermand this).
</p>
<div class="openblock">
<div class="content">
@@ -1600,7 +1601,7 @@ information.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-03-27 15:10:17 PDT
+Last updated 2013-04-07 16:36:03 PDT
</div>
</div>
</body>
|