1#!/bin/sh 2# 3# Copyright (c) 2005 Junio C Hamano. 4# 5 6SUBDIRECTORY_OK=Yes 7OPTIONS_KEEPDASHDASH= 8OPTIONS_STUCKLONG=t 9OPTIONS_SPEC="\ 10git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>] 11git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>] 12git rebase --continue | --abort | --skip | --edit-todo 13-- 14 Available options are 15v,verbose! display a diffstat of what changed upstream 16q,quiet! be quiet. implies --no-stat 17autostash automatically stash/stash pop before and after 18fork-point use 'merge-base --fork-point' to refine upstream 19onto=! rebase onto given branch instead of upstream 20r,rebase-merges? try to rebase merges instead of skipping them 21p,preserve-merges! try to recreate merges instead of ignoring them 22s,strategy=! use the given merge strategy 23X,strategy-option=! pass the argument through to the merge strategy 24no-ff! cherry-pick all commits, even if unchanged 25f,force-rebase! cherry-pick all commits, even if unchanged 26m,merge! use merging strategies to rebase 27i,interactive! let the user edit the list of commits to rebase 28x,exec=! add exec lines after each commit of the editable list 29k,keep-empty preserve empty commits during rebase 30allow-empty-message allow rebasing commits with empty messages 31stat! display a diffstat of what changed upstream 32n,no-stat! do not show diffstat of what changed upstream 33verify allow pre-rebase hook to run 34rerere-autoupdate allow rerere to update index with resolved conflicts 35root! rebase all reachable commits up to the root(s) 36autosquash move commits that begin with squash!/fixup! under -i 37signoff add a Signed-off-by: line to each commit 38committer-date-is-author-date! passed to 'git am' 39ignore-date! passed to 'git am' 40whitespace=! passed to 'git apply' 41ignore-whitespace! passed to 'git apply' 42C=! passed to 'git apply' 43S,gpg-sign? GPG-sign commits 44 Actions: 45continue! continue 46abort! abort and check out the original branch 47skip! skip current patch and continue 48edit-todo! edit the todo list during an interactive rebase 49quit! abort but keep HEAD where it is 50show-current-patch! show the patch file being applied or merged 51reschedule-failed-exec automatically reschedule failed exec commands 52" 53. git-sh-setup 54set_reflog_action rebase 55require_work_tree_exists 56cd_to_toplevel 57 58LF=' 59' 60ok_to_skip_pre_rebase= 61 62squash_onto= 63unset onto 64unset restrict_revision 65cmd= 66strategy= 67strategy_opts= 68do_merge= 69merge_dir="$GIT_DIR"/rebase-merge 70apply_dir="$GIT_DIR"/rebase-apply 71verbose= 72diffstat= 73test"$(git config --bool rebase.stat)"= true && diffstat=t 74autostash="$(git config --bool rebase.autostash || echo false)" 75fork_point=auto 76git_am_opt= 77git_format_patch_opt= 78rebase_root= 79force_rebase= 80allow_rerere_autoupdate= 81# Non-empty if a rebase was in progress when 'git rebase' was invoked 82in_progress= 83# One of {am, merge, interactive} 84type= 85# One of {"$GIT_DIR"/rebase-apply, "$GIT_DIR"/rebase-merge} 86state_dir= 87# One of {'', continue, skip, abort}, as parsed from command line 88action= 89rebase_merges= 90rebase_cousins= 91preserve_merges= 92autosquash= 93keep_empty= 94allow_empty_message=--allow-empty-message 95signoff= 96reschedule_failed_exec= 97test"$(git config --bool rebase.autosquash)"="true"&& autosquash=t 98case"$(git config --bool commit.gpgsign)"in 99true) gpg_sign_opt=-S;; 100*) gpg_sign_opt= ;; 101esac 102. git-rebase--common 103 104read_basic_state () { 105test -f"$state_dir/head-name"&& 106test -f"$state_dir/onto"&& 107 head_name=$(cat "$state_dir"/head-name)&& 108 onto=$(cat "$state_dir"/onto)&& 109# We always write to orig-head, but interactive rebase used to write to 110# head. Fall back to reading from head to cover for the case that the 111# user upgraded git with an ongoing interactive rebase. 112iftest -f"$state_dir"/orig-head 113then 114 orig_head=$(cat "$state_dir"/orig-head) 115else 116 orig_head=$(cat "$state_dir"/head) 117fi&& 118 GIT_QUIET=$(cat "$state_dir"/quiet)&& 119test -f"$state_dir"/verbose && verbose=t 120test -f"$state_dir"/strategy && strategy="$(cat "$state_dir"/strategy)" 121test -f"$state_dir"/strategy_opts && 122 strategy_opts="$(cat "$state_dir"/strategy_opts)" 123test -f"$state_dir"/allow_rerere_autoupdate && 124 allow_rerere_autoupdate="$(cat "$state_dir"/allow_rerere_autoupdate)" 125test -f"$state_dir"/gpg_sign_opt && 126 gpg_sign_opt="$(cat "$state_dir"/gpg_sign_opt)" 127test -f"$state_dir"/signoff && { 128 signoff="$(cat "$state_dir"/signoff)" 129 force_rebase=t 130} 131test -f"$state_dir"/reschedule-failed-exec&& 132 reschedule_failed_exec=t 133} 134 135finish_rebase () { 136rm-f"$(git rev-parse --git-path REBASE_HEAD)" 137 apply_autostash && 138{ git gc --auto|| true; } && 139rm-rf"$state_dir" 140} 141 142run_interactive () { 143 GIT_CHERRY_PICK_HELP="$resolvemsg" 144export GIT_CHERRY_PICK_HELP 145 146test -n"$keep_empty"&& keep_empty="--keep-empty" 147test -n"$rebase_merges"&& rebase_merges="--rebase-merges" 148test -n"$rebase_cousins"&& rebase_cousins="--rebase-cousins" 149test -n"$autosquash"&& autosquash="--autosquash" 150test -n"$verbose"&& verbose="--verbose" 151test -n"$force_rebase"&& force_rebase="--no-ff" 152test -n"$restrict_revision"&& \ 153 restrict_revision="--restrict-revision=^$restrict_revision" 154test -n"$upstream"&& upstream="--upstream=$upstream" 155test -n"$onto"&& onto="--onto=$onto" 156test -n"$squash_onto"&& squash_onto="--squash-onto=$squash_onto" 157test -n"$onto_name"&& onto_name="--onto-name=$onto_name" 158test -n"$head_name"&& head_name="--head-name=$head_name" 159test -n"$strategy"&& strategy="--strategy=$strategy" 160test -n"$strategy_opts"&& strategy_opts="--strategy-opts=$strategy_opts" 161test -n"$switch_to"&& switch_to="--switch-to=$switch_to" 162test -n"$cmd"&& cmd="--cmd=$cmd" 163test -n"$action"&& action="--$action" 164 165exec git rebase--interactive"$action""$keep_empty""$rebase_merges""$rebase_cousins" \ 166"$upstream""$onto""$squash_onto""$restrict_revision" \ 167"$allow_empty_message""$autosquash""$verbose" \ 168"$force_rebase""$onto_name""$head_name""$strategy" \ 169"$strategy_opts""$cmd""$switch_to" \ 170"$allow_rerere_autoupdate""$gpg_sign_opt""$signoff" \ 171"$reschedule_failed_exec" 172} 173 174run_specific_rebase () { 175if["$interactive_rebase"= implied ];then 176 GIT_EDITOR=: 177export GIT_EDITOR 178 autosquash= 179fi 180 181iftest -n"$interactive_rebase"-a -z"$preserve_merges" 182then 183 run_interactive 184else 185 . git-rebase--$type 186 187iftest -z"$preserve_merges" 188then 189 git_rebase__$type 190else 191 git_rebase__preserve_merges 192fi 193fi 194 195 ret=$? 196iftest$ret-eq0 197then 198 finish_rebase 199eliftest$ret-eq2# special exit status for rebase -p 200then 201 apply_autostash && 202rm-rf"$state_dir"&& 203 die "Nothing to do" 204fi 205exit$ret 206} 207 208run_pre_rebase_hook () { 209iftest -z"$ok_to_skip_pre_rebase"&& 210test -x"$(git rev-parse --git-path hooks/pre-rebase)" 211then 212"$(git rev-parse --git-path hooks/pre-rebase)"${1+"$@"}|| 213 die "$(gettext "The pre-rebase hook refused to rebase.")" 214fi 215} 216 217test -f"$apply_dir"/applying && 218 die "$(gettext "It looks like 'git am' is in progress. Cannot rebase.")" 219 220iftest -d"$apply_dir" 221then 222type=am 223 state_dir="$apply_dir" 224eliftest -d"$merge_dir" 225then 226iftest -d"$merge_dir"/rewritten 227then 228type=preserve-merges 229 interactive_rebase=explicit 230 preserve_merges=t 231eliftest -f"$merge_dir"/interactive 232then 233type=interactive 234 interactive_rebase=explicit 235else 236type=merge 237fi 238 state_dir="$merge_dir" 239fi 240test -n"$type"&& in_progress=t 241 242total_argc=$# 243whiletest$#!=0 244do 245case"$1"in 246--no-verify) 247 ok_to_skip_pre_rebase=yes 248;; 249--verify) 250 ok_to_skip_pre_rebase= 251;; 252--continue|--skip|--abort|--quit|--edit-todo|--show-current-patch) 253test$total_argc-eq2|| usage 254 action=${1##--} 255;; 256--onto=*) 257 onto="${1#--onto=}" 258;; 259--exec=*) 260 cmd="${cmd}exec${1#--exec=}${LF}" 261test -z"$interactive_rebase"&& interactive_rebase=implied 262;; 263--interactive) 264 interactive_rebase=explicit 265;; 266--keep-empty) 267 keep_empty=yes 268;; 269--allow-empty-message) 270 allow_empty_message=--allow-empty-message 271;; 272--no-keep-empty) 273 keep_empty= 274;; 275--rebase-merges) 276 rebase_merges=t 277test -z"$interactive_rebase"&& interactive_rebase=implied 278;; 279--rebase-merges=*) 280 rebase_merges=t 281case"${1#*=}"in 282 rebase-cousins) rebase_cousins=t;; 283 no-rebase-cousins) rebase_cousins=;; 284*) die "Unknown mode:$1";; 285esac 286test -z"$interactive_rebase"&& interactive_rebase=implied 287;; 288--preserve-merges) 289 preserve_merges=t 290test -z"$interactive_rebase"&& interactive_rebase=implied 291;; 292--autosquash) 293 autosquash=t 294;; 295--no-autosquash) 296 autosquash= 297;; 298--fork-point) 299 fork_point=t 300;; 301--no-fork-point) 302 fork_point= 303;; 304--merge) 305 do_merge=t 306;; 307--strategy-option=*) 308 strategy_opts="$strategy_opts$(git rev-parse --sq-quote "--${1#--strategy-option=}" | sed -e s/^.//)" 309 do_merge=t 310test -z"$strategy"&& strategy=recursive 311;; 312--strategy=*) 313 strategy="${1#--strategy=}" 314 do_merge=t 315;; 316--no-stat) 317 diffstat= 318;; 319--stat) 320 diffstat=t 321;; 322--autostash) 323 autostash=true 324;; 325--no-autostash) 326 autostash=false 327;; 328--verbose) 329 verbose=t 330 diffstat=t 331 GIT_QUIET= 332;; 333--quiet) 334 GIT_QUIET=t 335 git_am_opt="$git_am_opt-q" 336 verbose= 337 diffstat= 338;; 339--whitespace=*) 340 git_am_opt="$git_am_opt--whitespace=${1#--whitespace=}" 341case"${1#--whitespace=}"in 342 fix|strip) 343 force_rebase=t 344;; 345 warn|nowarn|error|error-all) 346;;# okay, known whitespace option 347*) 348 die "fatal: Invalid whitespace option: '${1#*=}'" 349;; 350esac 351;; 352--ignore-whitespace) 353 git_am_opt="$git_am_opt$1" 354;; 355--signoff) 356 signoff=--signoff 357;; 358--no-signoff) 359 signoff= 360;; 361--committer-date-is-author-date|--ignore-date) 362 git_am_opt="$git_am_opt$1" 363 force_rebase=t 364;; 365-C*[!0-9]*) 366 die "fatal: switch \`C' expects a numerical value" 367;; 368-C*) 369 git_am_opt="$git_am_opt$1" 370;; 371--root) 372 rebase_root=t 373;; 374--force-rebase|--no-ff) 375 force_rebase=t 376;; 377--rerere-autoupdate|--no-rerere-autoupdate) 378 allow_rerere_autoupdate="$1" 379;; 380--gpg-sign) 381 gpg_sign_opt=-S 382;; 383--gpg-sign=*) 384 gpg_sign_opt="-S${1#--gpg-sign=}" 385;; 386--reschedule-failed-exec) 387 reschedule_failed_exec=--reschedule-failed-exec 388;; 389--no-reschedule-failed-exec) 390 reschedule_failed_exec= 391;; 392--) 393shift 394break 395;; 396*) 397 usage 398;; 399esac 400shift 401done 402test$#-gt2&& usage 403 404iftest -n"$action" 405then 406test -z"$in_progress"&& die "$(gettext "No rebase in progress?")" 407# Only interactive rebase uses detailed reflog messages 408iftest -n"$interactive_rebase"&&test"$GIT_REFLOG_ACTION"= rebase 409then 410 GIT_REFLOG_ACTION="rebase -i ($action)" 411export GIT_REFLOG_ACTION 412fi 413fi 414 415iftest"$action"="edit-todo"&&test -z"$interactive_rebase" 416then 417 die "$(gettext "The --edit-todo action can only be used during interactive rebase.")" 418fi 419 420case"$action"in 421continue) 422# Sanity check 423 git rev-parse --verify HEAD >/dev/null || 424 die "$(gettext "Cannot read HEAD")" 425 git update-index --ignore-submodules --refresh&& 426 git diff-files --quiet --ignore-submodules|| { 427echo"$(gettext "You must edit all merge conflicts and then 428mark them as resolved using git add")" 429exit1 430} 431 read_basic_state 432 run_specific_rebase 433;; 434skip) 435 output git reset--hard HEAD ||exit $? 436 read_basic_state 437 run_specific_rebase 438;; 439abort) 440 git rerere clear 441 read_basic_state 442case"$head_name"in 443 refs/*) 444 git symbolic-ref -m"rebase: aborting" HEAD $head_name|| 445 die "$(eval_gettext "Could not move back to \$head_name")" 446;; 447esac 448 output git reset--hard$orig_head 449 finish_rebase 450exit 451;; 452quit) 453execrm-rf"$state_dir" 454;; 455edit-todo) 456 run_specific_rebase 457;; 458show-current-patch) 459 run_specific_rebase 460 die "BUG: run_specific_rebase is not supposed to return here" 461;; 462esac 463 464# Make sure no rebase is in progress 465iftest -n"$in_progress" 466then 467 state_dir_base=${state_dir##*/} 468 cmd_live_rebase="git rebase (--continue | --abort | --skip)" 469 cmd_clear_stale_rebase="rm -fr\"$state_dir\"" 470 die " 471$(eval_gettext 'It seems that there is already a$state_dir_basedirectory, and 472I wonder if you are in the middle of another rebase. If that is the 473case, please try 474$cmd_live_rebase 475If that is not the case, please 476$cmd_clear_stale_rebase 477and run me again. I am stopping in case you still have something 478valuable there.')" 479fi 480 481iftest -n"$rebase_root"&&test -z"$onto" 482then 483test -z"$interactive_rebase"&& interactive_rebase=implied 484fi 485 486iftest -n"$keep_empty" 487then 488test -z"$interactive_rebase"&& interactive_rebase=implied 489fi 490 491iftest -n"$interactive_rebase" 492then 493iftest -z"$preserve_merges" 494then 495type=interactive 496else 497type=preserve-merges 498fi 499 500 state_dir="$merge_dir" 501eliftest -n"$do_merge" 502then 503type=merge 504 state_dir="$merge_dir" 505else 506type=am 507 state_dir="$apply_dir" 508fi 509 510iftest -t2&&test -z"$GIT_QUIET" 511then 512 git_format_patch_opt="$git_format_patch_opt--progress" 513fi 514 515iftest -n"$git_am_opt";then 516 incompatible_opts=$(echo"$git_am_opt"| \ 517sed-e's/ -q / /g'-e's/^ \(.*\) $/\1/') 518iftest -n"$interactive_rebase" 519then 520iftest -n"$incompatible_opts" 521then 522 die "$(gettext "error: cannot combine interactive options (--interactive, --exec, --rebase-merges, --preserve-merges, --keep-empty, --root + --onto)with am options ($incompatible_opts)")" 523 fi 524 fi 525 if test -n "$do_merge"; then 526 if test -n "$incompatible_opts" 527 then 528 die "$(gettext "error: cannot combine merge options (--merge, --strategy, --strategy-option) with am options ($incompatible_opts)")" 529fi 530fi 531fi 532 533iftest -n"$signoff" 534then 535test -n"$preserve_merges"&& 536 die "$(gettext "error: cannot combine '--signoff' with '--preserve-merges'")" 537 git_am_opt="$git_am_opt$signoff" 538 force_rebase=t 539fi 540 541iftest -n"$preserve_merges" 542then 543# Note: incompatibility with --signoff handled in signoff block above 544# Note: incompatibility with --interactive is just a strong warning; 545# git-rebase.txt caveats with "unless you know what you are doing" 546test -n"$rebase_merges"&& 547 die "$(gettext "error: cannot combine '--preserve-merges' with '--rebase-merges'")" 548 549test -n"$reschedule_failed_exec"&& 550 die "$(gettext "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'")" 551fi 552 553iftest -n"$rebase_merges" 554then 555test -n"$strategy_opts"&& 556 die "$(gettext "error: cannot combine '--rebase-merges' with '--strategy-option'")" 557test -n"$strategy"&& 558 die "$(gettext "error: cannot combine '--rebase-merges' with '--strategy'")" 559fi 560 561iftest -z"$rebase_root" 562then 563case"$#"in 5640) 565if! upstream_name=$(git rev-parse --symbolic-full-name \ 566--verify -q @{upstream}2>/dev/null) 567then 568 . git-parse-remote 569 error_on_missing_default_upstream "rebase""rebase" \ 570"against""git rebase$(gettext '<branch>')" 571fi 572 573test"$fork_point"= auto && fork_point=t 574;; 575*) upstream_name="$1" 576iftest"$upstream_name"="-" 577then 578 upstream_name="@{-1}" 579fi 580shift 581;; 582esac 583 upstream=$(peel_committish "${upstream_name}")|| 584 die "$(eval_gettext "invalid upstream '\$upstream_name'")" 585 upstream_arg="$upstream_name" 586else 587iftest -z"$onto" 588then 589 empty_tree=$(git hash-object -t tree /dev/null) 590 onto=$(git commit-tree $empty_tree </dev/null) 591 squash_onto="$onto" 592fi 593unset upstream_name 594unset upstream 595test$#-gt1&& usage 596 upstream_arg=--root 597fi 598 599# Make sure the branch to rebase onto is valid. 600onto_name=${onto-"$upstream_name"} 601case"$onto_name"in 602*...*) 603if left=${onto_name%...*} right=${onto_name#*...}&& 604 onto=$(git merge-base --all ${left:-HEAD} ${right:-HEAD}) 605then 606case"$onto"in 607 ?*"$LF"?*) 608 die "$(eval_gettext "\$onto_name: there are more than one merge bases")" 609;; 610'') 611 die "$(eval_gettext "\$onto_name: there is no merge base")" 612;; 613esac 614else 615 die "$(eval_gettext "\$onto_name: there is no merge base")" 616fi 617;; 618*) 619 onto=$(peel_committish "$onto_name")|| 620 die "$(eval_gettext "Does not point to a valid commit: \$onto_name")" 621;; 622esac 623 624# If the branch to rebase is given, that is the branch we will rebase 625# $branch_name -- branch/commit being rebased, or HEAD (already detached) 626# $orig_head -- commit object name of tip of the branch before rebasing 627# $head_name -- refs/heads/<that-branch> or "detached HEAD" 628switch_to= 629case"$#"in 6301) 631# Is it "rebase other $branchname" or "rebase other $commit"? 632 branch_name="$1" 633 switch_to="$1" 634 635# Is it a local branch? 636if git show-ref --verify --quiet --"refs/heads/$branch_name"&& 637 orig_head=$(git rev-parse -q --verify "refs/heads/$branch_name") 638then 639 head_name="refs/heads/$branch_name" 640# If not is it a valid ref (branch or commit)? 641elif orig_head=$(git rev-parse -q --verify "$branch_name") 642then 643 head_name="detached HEAD" 644 645else 646 die "$(eval_gettext "fatal: no such branch/commit '\$branch_name'")" 647fi 648;; 6490) 650# Do not need to switch branches, we are already on it. 651if branch_name=$(git symbolic-ref -q HEAD) 652then 653 head_name=$branch_name 654 branch_name=$(expr "z$branch_name" : 'zrefs/heads/\(.*\)') 655 else 656 head_name="detached HEAD" 657 branch_name=HEAD 658 fi 659 orig_head=$(git rev-parse --verify HEAD)|| exit 660 ;; 661*) 662 die "BUG: unexpected number of arguments left to parse" 663 ;; 664esac 665 666if test "$fork_point" = t 667then 668 new_upstream=$(git merge-base --fork-point "$upstream_name" \ 669 "${switch_to:-HEAD}") 670 if test -n "$new_upstream" 671 then 672 restrict_revision=$new_upstream 673 fi 674fi 675 676if test "$autostash" = true && ! (require_clean_work_tree) 2>/dev/null 677then 678 stash_sha1=$(git stash create "autostash")|| 679 die "$(gettext 'Cannot autostash')" 680 681 mkdir -p "$state_dir" && 682 echo$stash_sha1>"$state_dir/autostash" && 683 stash_abbrev=$(git rev-parse --short $stash_sha1)&& 684 echo "$(eval_gettext 'Created autostash: $stash_abbrev')" && 685 git reset --hard 686fi 687 688require_clean_work_tree "rebase" "$(gettext "Please commit or stash them.")" 689 690# Now we are rebasing commits$upstream..$orig_head(or with --root, 691# everything leading up to$orig_head) on top of$onto 692 693# Check if we are already based on$ontowith linear history, 694# but this should be done only when upstream and onto are the same 695# and if this is not an interactive rebase. 696mb=$(git merge-base "$onto" "$orig_head") 697if test -z "$interactive_rebase" && test "$upstream" = "$onto" && 698 test "$mb" = "$onto" && test -z "$restrict_revision" && 699 # linear history? 700 ! (git rev-list --parents "$onto".."$orig_head" | sane_grep " .* ") > /dev/null 701then 702 if test -z "$force_rebase" 703 then 704 # Lazily switch to the target branch if needed... 705 test -z "$switch_to" || 706 GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout$switch_to" \ 707 git checkout -q "$switch_to" -- 708 if test "$branch_name" = "HEAD" && 709 ! git symbolic-ref -q HEAD 710 then 711 say "$(eval_gettext "HEAD is up to date.")" 712 else 713 say "$(eval_gettext "Current branch \$branch_name is up to date.")" 714 fi 715 finish_rebase 716 exit 0 717 else 718 if test "$branch_name" = "HEAD" && 719 ! git symbolic-ref -q HEAD 720 then 721 say "$(eval_gettext "HEAD is up to date, rebase forced.")" 722 else 723 say "$(eval_gettext "Current branch \$branch_name is up to date, rebase forced.")" 724 fi 725 fi 726fi 727 728# If a hook exists, give it a chance to interrupt 729run_pre_rebase_hook "$upstream_arg" "$@" 730 731if test -n "$diffstat" 732then 733 if test -n "$verbose" 734 then 735 if test -z "$mb" 736 then 737 echo "$(eval_gettext "Changes to \$onto:")" 738 else 739 echo "$(eval_gettext "Changes from \$mb to \$onto:")" 740 fi 741 fi 742 mb_tree="${mb:-$(git hash-object -t tree /dev/null)}" 743 # We want color (if set), but no pager 744 GIT_PAGER='' git diff --stat --summary "$mb_tree" "$onto" 745fi 746 747test -n "$interactive_rebase" && run_specific_rebase 748 749# Detach HEAD and reset the tree 750say "$(gettext "First, rewinding head to replay your work on top of it...")" 751 752GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout$onto_name" \ 753 git checkout -q "$onto^0" || die "could not detach HEAD" 754git update-ref ORIG_HEAD$orig_head 755 756# If the$ontois a proper descendant of the tip of the branch, then 757# we just fast-forwarded. 758if test "$mb" = "$orig_head" 759then 760 say "$(eval_gettext "Fast-forwarded \$branch_name to \$onto_name.")" 761 move_to_original_branch 762 finish_rebase 763 exit 0 764fi 765 766if test -n "$rebase_root" 767then 768 revisions="$onto..$orig_head" 769else 770 revisions="${restrict_revision-$upstream}..$orig_head" 771fi 772 773run_specific_rebase