aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2007-09-30 00:34:23 +0100
committerJunio C Hamano <gitster@pobox.com>2007-09-29 23:16:08 -0700
commit81ab1cb43a872fc527b26388bc7e781c816d723b (patch)
tree7783e1e06b25876f8b93b434bcae2ffbaa9c000b /Documentation/git-rebase.txt
parent6a6eb3d09fcbfae41978fb5223ae03e2d103968b (diff)
downloadgit-81ab1cb43a872fc527b26388bc7e781c816d723b.tar.gz
git-81ab1cb43a872fc527b26388bc7e781c816d723b.tar.xz
rebase -i: squash should retain the authorship of the _first_ commit
It was determined on the mailing list, that it makes more sense for a "squash" to keep the author of the first commit as the author for the result of the squash. Make it so. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rebase.txt')
-rw-r--r--Documentation/git-rebase.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 61b1810db..dfb8a0da5 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -293,7 +293,7 @@ rebasing.
If you want to fold two or more commits into one, replace the command
"pick" with "squash" for the second and subsequent commit. If the
commits had different authors, it will attribute the squashed commit to
-the author of the last commit.
+the author of the first commit.
In both cases, or when a "pick" does not succeed (because of merge
errors), the loop will stop to let you fix things, and you can continue