diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-10-19 23:07:23 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-19 23:07:23 (GMT) |
| commit | 310d188f7e1d1fbbeace17d5c62e422fd0b5a824 (patch) | |
| tree | 03b67c95d2c1813e551966fd2526a0e42495e8e9 /Documentation/git-commit.txt | |
| parent | adcb2e0f466aa39cc5f15d5a76d1151f6c47daf2 (diff) | |
| parent | f948dd899210e5a51cd716245affb7c121bf8791 (diff) | |
| download | git-310d188f7e1d1fbbeace17d5c62e422fd0b5a824.zip git-310d188f7e1d1fbbeace17d5c62e422fd0b5a824.tar.gz git-310d188f7e1d1fbbeace17d5c62e422fd0b5a824.tar.bz2 | |
Merge branch 'tr/workflow-doc'
* tr/workflow-doc:
Documentation: add manpage about workflows
Documentation: Refer to git-rebase(1) to warn against rewriting
Documentation: new upstream rebase recovery section in git-rebase
Diffstat (limited to 'Documentation/git-commit.txt')
| -rw-r--r-- | Documentation/git-commit.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 41809ee..2e62165 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -145,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:: |