Merge branch 'rr/needs-clean-work-tree'
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Nov 2010 01:52:32 +0000 (29 17:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Nov 2010 01:52:32 +0000 (29 17:52 -0800)
* rr/needs-clean-work-tree:
  Porcelain scripts: Rewrite cryptic "needs update" error message

1  2 
git-rebase--interactive.sh
git-rebase.sh

Simple merge
diff --cc git-rebase.sh
Simple merge