Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sun, 30 Sep 2007 06:32:36 +0000 (23:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 30 Sep 2007 06:32:36 +0000 (23:32 -0700)
* 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

1  2 
Documentation/git-rebase.txt
git-rebase--interactive.sh
git-remote.perl
t/t3404-rebase-interactive.sh
Simple merge
Simple merge
diff --cc git-remote.perl
Simple merge
Simple merge