diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-09-30 06:32:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-30 06:32:36 (GMT) |
| commit | 2af89f12c666634e92cd79a6c1af6acc34104c34 (patch) | |
| tree | 6f5ccd286e8741b41d3384025e1df43194ff2feb /t/t3404-rebase-interactive.sh | |
| parent | f8babc4dabebebd9e95537df6da0408c1c178615 (diff) | |
| parent | f4bb20cc99fe18ba0e7dd421f1d95a05c1cbbc93 (diff) | |
| download | git-2af89f12c666634e92cd79a6c1af6acc34104c34.zip git-2af89f12c666634e92cd79a6c1af6acc34104c34.tar.gz git-2af89f12c666634e92cd79a6c1af6acc34104c34.tar.bz2 | |
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/t3404-rebase-interactive.sh')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 1af73a4..f5ef8c2 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' ' |