Documentation: add manpage about workflows

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index eb05b0f49b0c513581150415d1a4e679d7bfbea6..eeba58df2bc738afa0a7d1aedcf09ef02215578e 100644 (file)
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -144,6 +144,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::