Teach 'git pull' to handle --rebase=interactive

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

Documentation/git-pull.txt

@@ -104,7 +104,7 @@ Options related to merging
 include::merge-options.txt[]
 
 -r::
---rebase[=false|true|preserve]::
+--rebase[=false|true|preserve|interactive]::
 	When true, rebase the current branch on top of the upstream
 	branch after fetching. If there is a remote-tracking branch
 	corresponding to the upstream branch and the upstream branch
@@ -116,6 +116,8 @@ to `git rebase` so that locally created merge commits will not be flattened.
 +
 When false, merge the current branch into the upstream branch.
 +
+When `interactive`, enable the interactive mode of rebase.
++
 See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in
 linkgit:git-config[1] if you want to make `git pull` always use
 `--rebase` instead of merging.

git-pull.sh

@@ -138,6 +138,7 @@ do
 		;;
 	--no-r|--no-re|--no-reb|--no-reba|--no-rebas|--no-rebase)
 		rebase=false
+
 		;;
 	--recurse-submodules)
 		recurse_submodules=--recurse-submodules
@@ -178,14 +179,18 @@ do
 done
 
 case "$rebase" in
+i|interactive)
+	rebase=true
+	rebase_args=-i
+	;;
 preserve)
 	rebase=true
 	rebase_args=--preserve-merges
 	;;
 true|false|'')
 	;;
 *)
-	echo "Invalid value for --rebase, should be true, false, or preserve"
+	echo "Invalid value for --rebase, should be true, false, interactive or preserve"
 	usage
 	exit 1
 	;;