Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'maint'
[gitweb.git]
/
t
/
t3404-rebase-interactive.sh
diff --git
a/t/t3404-rebase-interactive.sh
b/t/t3404-rebase-interactive.sh
index 1af73a47c6af80c51a6ac6df4c5b20529c1a3565..f5ef8c22586525a23f53aaac7b895d634a410805 100755
(executable)
--- a/
t/t3404-rebase-interactive.sh
+++ b/
t/t3404-rebase-interactive.sh
@@
-180,7
+180,7
@@
test_expect_success 'squash' '
'
test_expect_success 'retain authorship when squashing' '
- git show HEAD | grep "^Author:
Nitfol
"
+ git show HEAD | grep "^Author:
Twerp Snog
"
'
test_expect_success 'preserve merges with -p' '