From 97c33c658365e0467e931bb8fed67d4f2a8d26f1 Mon Sep 17 00:00:00 2001 From: Thomas Rast Date: Sat, 13 Sep 2008 18:11:01 +0200 Subject: 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 Signed-off-by: Junio C Hamano --- Documentation/git-commit.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Documentation/git-commit.txt') diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index eb05b0f49b..eeba58df2b 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:: -- cgit v1.2.1