Merge branch 'mm/rebase-i-exec'

* mm/rebase-i-exec:
  git-rebase--interactive.sh: use printf instead of echo to print commit message
  git-rebase--interactive.sh: rework skip_unnecessary_picks
  test-lib: user-friendly alternatives to test [-d|-f|-e]
  rebase -i: add exec command to launch a shell command

Conflicts:
	git-rebase--interactive.sh
	t/t3404-rebase-interactive.sh

diff --cc Documentation/git-rebase.txt
Simple merge

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

diff --cc t/t3404-rebase-interactive.sh
index 3af3f603fb2ad34368b4f53f523bdd71dffdf854,56891e6c74c0883236074b39fdbd83a96c5c9658..af3b663aeee8354c6f8f2dff05666f6d70c07055
--- 1/t/t3404-rebase-interactive.sh
--- 2/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@@ -150,10 -211,9 +211,10 @@@ test_expect_success 'abort with error w
        git rm --cached file1 &&
        git commit -m "remove file in base" &&
        test_must_fail git rebase -i master > output 2>&1 &&
 -      grep "Untracked working tree file .file1. would be overwritten" \
 +      grep "The following untracked working tree files would be overwritten by checkout:" \
                output &&
-       ! test -d .git/rebase-merge &&
 +      grep "file1" output &&
+       test_path_is_missing .git/rebase-merge &&
        git reset --hard HEAD^
  '
  

diff --cc t/test-lib.sh
Simple merge