aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-commit.txt
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2008-09-13 18:11:01 +0200
committerJunio C Hamano <gitster@pobox.com>2008-09-15 21:22:58 -0700
commit97c33c658365e0467e931bb8fed67d4f2a8d26f1 (patch)
tree2330a4a9656828184fd29b975410d2ee9f5a612c /Documentation/git-commit.txt
parent90d1c08efcf9c688df207588d9b72178524a62b6 (diff)
downloadgit-97c33c658365e0467e931bb8fed67d4f2a8d26f1.tar.gz
git-97c33c658365e0467e931bb8fed67d4f2a8d26f1.tar.xz
Documentation: Refer to git-rebase(1) to warn against rewriting
This points readers at the "Recovering from upstream rebase" warning in git-rebase(1) when we talk about rewriting published history in the 'reset', 'commit --amend', and 'filter-branch' documentation. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-commit.txt')
-rw-r--r--Documentation/git-commit.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index eb05b0f49..eeba58df2 100644
--- 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::