aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-09-29 23:32:36 -0700
committerJunio C Hamano <gitster@pobox.com>2007-09-29 23:32:36 -0700
commit2af89f12c666634e92cd79a6c1af6acc34104c34 (patch)
tree6f5ccd286e8741b41d3384025e1df43194ff2feb /t
parentf8babc4dabebebd9e95537df6da0408c1c178615 (diff)
parentf4bb20cc99fe18ba0e7dd421f1d95a05c1cbbc93 (diff)
downloadgit-2af89f12c666634e92cd79a6c1af6acc34104c34.tar.gz
git-2af89f12c666634e92cd79a6c1af6acc34104c34.tar.xz
Merge branch 'maint'
* maint: git-remote: exit with non-zero status after detecting errors. rebase -i: squash should retain the authorship of the _first_ commit git-add--interactive: Improve behavior on bogus input git-add--interactive: Allow Ctrl-D to exit
Diffstat (limited to 't')
-rwxr-xr-xt/t3404-rebase-interactive.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 1af73a47c..f5ef8c225 100755
--- 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' '