global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-11 18:30:40 +00:00
Code Issues Packages Projects Releases 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 Pat Thoyts
parent 8aea7bcd4d
commit eb0d40d3fc
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
git-pull.sh
View File

@@ -43,6 +43,7 @@ log_arg= verbosity= progress= recurse_submodules= verify_signatures=
merge_args= edit=
curr_branch=$(git symbolic-ref -q HEAD)
curr_branch_short="${curr_branch#refs/heads/}"
rebase_options=
rebase=$(git config --bool branch.$curr_branch_short.rebase)
if test -z "$rebase"
then
@@ -113,7 +114,12 @@ do
-r|--r|--re|--reb|--reba|--rebas|--rebase)
rebase=true
;;
--rebase=i|--rebase=interactive)
rebase_options=-i
rebase=true
;;
--no-r|--no-re|--no-reb|--no-reba|--no-rebas|--no-rebase)
rebase_options=
rebase=false
;;
--recurse-submodules)
@@ -292,7 +298,7 @@ fi
merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit
case "$rebase" in
true)
eval="git-rebase $diffstat $strategy_args $merge_args $verbosity"
eval="git-rebase $rebase_options $diffstat $strategy_args $merge_args $verbosity"
eval="$eval --onto $merge_head ${oldremoteref:-$merge_head}"
;;
*)