git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-05-03 12:26:23 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

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

Browse Source 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2011-10-21 23:27:09 -05:00
committed by Karsten Blees
parent 20ba112c95
commit dd3eebb4c6
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
git-pull.sh
View File

@@ -135,6 +135,7 @@ do
;;
--no-r|--no-re|--no-reb|--no-reba|--no-rebas|--no-rebase)
rebase=false
;;
--recurse-submodules)
recurse_submodules=--recurse-submodules
@@ -175,6 +176,10 @@ do
done
case "$rebase" in
i|interactive)
rebase=true
rebase_args=-i
;;
preserve)
rebase=true
rebase_args=--preserve-merges
@@ -182,7 +187,7 @@ preserve)
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
;;