summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
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 /git-rebase--interactive.sh
parent6a6eb3d09fcbfae41978fb5223ae03e2d103968b (diff)
downloadgit-81ab1cb43a872fc527b26388bc7e781c816d723b.tar.gz
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 'git-rebase--interactive.sh')
-rwxr-xr-xgit-rebase--interactive.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 2fa53fdaeb..653393d8c9 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -261,9 +261,9 @@ do_next () {
esac
failed=f
+ author_script=$(get_author_ident_from_commit HEAD)
output git reset --soft HEAD^
pick_one -n $sha1 || failed=t
- author_script=$(get_author_ident_from_commit $sha1)
echo "$author_script" > "$DOTEST"/author-script
case $failed in
f)