summaryrefslogtreecommitdiffstats
path: root/git-commit.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-10-20 05:42:33 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-10-20 05:42:33 +0000
commit7d06a8aba96d4197610b089a0862b46d84a36f53 (patch)
tree32010c51081107cd4c7b54fb59b212abdd429fcd /git-commit.txt
parenta2deec5920d1cc24a58ea6af6f0f7d36dedd0f7d (diff)
downloadgit-htmldocs-7d06a8aba96d4197610b089a0862b46d84a36f53.tar.gz
Autogenerated HTML docs for v1.6.0.2-588-g3102
Diffstat (limited to 'git-commit.txt')
-rw-r--r--git-commit.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/git-commit.txt b/git-commit.txt
index eb05b0f49..2e62165fa 100644
--- a/git-commit.txt
+++ b/git-commit.txt
@@ -94,7 +94,8 @@ OPTIONS
-s::
--signoff::
- Add Signed-off-by line at the end of the commit message.
+ Add Signed-off-by line by the commiter at the end of the commit
+ log message.
-n::
--no-verify::
@@ -144,6 +145,10 @@ It is a rough equivalent for:
------
but can be used to amend a merge commit.
--
++
+You should understand the implications of rewriting history if you
+amend a commit that has already been published. (See the "RECOVERING
+FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].)
-i::
--include::