Fix interactive rebase to preserve author email address
Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
3f7701a4db
commit
5909651ea2
@ -371,7 +371,7 @@ do
|
|||||||
. "$DOTEST"/author-script && {
|
. "$DOTEST"/author-script && {
|
||||||
test ! -f "$DOTEST"/amend || git reset --soft HEAD^
|
test ! -f "$DOTEST"/amend || git reset --soft HEAD^
|
||||||
} &&
|
} &&
|
||||||
export GIT_AUTHOR_NAME GIT_AUTHOR_NAME GIT_AUTHOR_DATE &&
|
export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE &&
|
||||||
git commit -F "$DOTEST"/message -e
|
git commit -F "$DOTEST"/message -e
|
||||||
|
|
||||||
require_clean_work_tree
|
require_clean_work_tree
|
||||||
|
Loading…
Reference in New Issue
Block a user