]>
Commit | Line | Data |
---|---|---|
59e6b23a JH |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2005 Junio C Hamano. | |
4 | # | |
5 | ||
15a147e6 | 6 | USAGE='[--interactive | -i] [-v] [--force-rebase | -f] [--no-ff] [--onto <newbase>] [<upstream>|--root] [<branch>] [--quiet | -q]' |
031321c6 SE |
7 | LONG_USAGE='git-rebase replaces <branch> with a new branch of the |
8 | same name. When the --onto option is provided the new branch starts | |
9 | out with a HEAD equal to <newbase>, otherwise it is equal to <upstream> | |
10 | It then attempts to create a new commit for each commit from the original | |
11 | <branch> that does not exist in the <upstream> branch. | |
69a60af5 | 12 | |
031321c6 SE |
13 | It is possible that a merge failure will prevent this process from being |
14 | completely automatic. You will have to resolve any such merge failure | |
cc120056 | 15 | and run git rebase --continue. Another option is to bypass the commit |
5960bc9d | 16 | that caused the merge failure with git rebase --skip. To check out the |
51ef1daa JS |
17 | original <branch> and remove the .git/rebase-apply working files, use the |
18 | command git rebase --abort instead. | |
69a60af5 | 19 | |
031321c6 | 20 | Note that if <branch> is not specified on the command line, the |
702088af | 21 | currently checked out branch is used. |
e646c9c8 | 22 | |
031321c6 | 23 | Example: git-rebase master~1 topic |
e646c9c8 | 24 | |
285c6cbf | 25 | A---B---C topic A'\''--B'\''--C'\'' topic |
031321c6 SE |
26 | / --> / |
27 | D---E---F---G master D---E---F---G master | |
e646c9c8 | 28 | ' |
533b7039 JH |
29 | |
30 | SUBDIRECTORY_OK=Yes | |
45e2acf3 MZ |
31 | OPTIONS_KEEPDASHDASH= |
32 | OPTIONS_SPEC="\ | |
33 | git rebase [-i] [options] [--onto <newbase>] [<upstream>] [<branch>] | |
34 | git rebase [-i] [options] --onto <newbase> --root [<branch>] | |
35 | git-rebase [-i] --continue | --abort | --skip | |
36 | -- | |
37 | Available options are | |
38 | v,verbose! display a diffstat of what changed upstream | |
39 | q,quiet! be quiet. implies --no-stat | |
40 | onto=! rebase onto given branch instead of upstream | |
41 | p,preserve-merges! try to recreate merges instead of ignoring them | |
42 | s,strategy=! use the given merge strategy | |
43 | no-ff! cherry-pick all commits, even if unchanged | |
44 | m,merge! use merging strategies to rebase | |
45 | i,interactive! let the user edit the list of commits to rebase | |
46 | f,force-rebase! force rebase even if branch is up to date | |
47 | X,strategy-option=! pass the argument through to the merge strategy | |
48 | stat! display a diffstat of what changed upstream | |
49 | n,no-stat! do not show diffstat of what changed upstream | |
50 | verify allow pre-rebase hook to run | |
51 | rerere-autoupdate allow rerere to update index with resolved conflicts | |
52 | root! rebase all reachable commits up to the root(s) | |
53 | autosquash move commits that begin with squash!/fixup! under -i | |
54 | committer-date-is-author-date! passed to 'git am' | |
55 | ignore-date! passed to 'git am' | |
56 | whitespace=! passed to 'git apply' | |
57 | ignore-whitespace! passed to 'git apply' | |
58 | C=! passed to 'git apply' | |
59 | Actions: | |
5960bc9d MZ |
60 | continue! continue |
61 | abort! abort and check out the original branch | |
62 | skip! skip current patch and continue | |
45e2acf3 | 63 | " |
ae2b0f15 | 64 | . git-sh-setup |
f9474132 | 65 | set_reflog_action rebase |
035b5bf6 | 66 | require_work_tree_exists |
533b7039 | 67 | cd_to_toplevel |
4282c4fb | 68 | |
61dfa1bb JH |
69 | LF=' |
70 | ' | |
6bb4e485 MZ |
71 | ok_to_skip_pre_rebase= |
72 | resolvemsg=" | |
cc120056 SE |
73 | When you have resolved this problem run \"git rebase --continue\". |
74 | If you would prefer to skip this patch, instead run \"git rebase --skip\". | |
5960bc9d | 75 | To check out the original branch and stop rebasing run \"git rebase --abort\". |
cc120056 | 76 | " |
6bb4e485 | 77 | unset onto |
9765b6ab | 78 | strategy= |
93ce190c | 79 | strategy_opts= |
58634dbf | 80 | do_merge= |
69a636ad MZ |
81 | merge_dir="$GIT_DIR"/rebase-merge |
82 | apply_dir="$GIT_DIR"/rebase-apply | |
b758789c | 83 | verbose= |
9474a029 MZ |
84 | diffstat= |
85 | test "$(git config --bool rebase.stat)" = true && diffstat=t | |
67dad687 | 86 | git_am_opt= |
190f5323 | 87 | rebase_root= |
b2f82e05 | 88 | force_rebase= |
cb6020bb | 89 | allow_rerere_autoupdate= |
99de0640 MZ |
90 | # Non-empty if a rebase was in progress when 'git rebase' was invoked |
91 | in_progress= | |
92 | # One of {am, merge, interactive} | |
93 | type= | |
94 | # One of {"$GIT_DIR"/rebase-apply, "$GIT_DIR"/rebase-merge} | |
95 | state_dir= | |
34262322 MZ |
96 | # One of {'', continue, skip, abort}, as parsed from command line |
97 | action= | |
cf432ca0 MZ |
98 | preserve_merges= |
99 | autosquash= | |
100 | test "$(git config --bool rebase.autosquash)" = "true" && autosquash=t | |
58634dbf | 101 | |
fa99c1e1 | 102 | read_basic_state () { |
02ac45fa MZ |
103 | head_name=$(cat "$state_dir"/head-name) && |
104 | onto=$(cat "$state_dir"/onto) && | |
84df4560 MZ |
105 | # We always write to orig-head, but interactive rebase used to write to |
106 | # head. Fall back to reading from head to cover for the case that the | |
107 | # user upgraded git with an ongoing interactive rebase. | |
108 | if test -f "$state_dir"/orig-head | |
2959c283 | 109 | then |
2959c283 | 110 | orig_head=$(cat "$state_dir"/orig-head) |
84df4560 MZ |
111 | else |
112 | orig_head=$(cat "$state_dir"/head) | |
2959c283 | 113 | fi && |
7b37a7c6 MZ |
114 | GIT_QUIET=$(cat "$state_dir"/quiet) && |
115 | test -f "$state_dir"/verbose && verbose=t | |
80ff4795 MZ |
116 | test -f "$state_dir"/strategy && strategy="$(cat "$state_dir"/strategy)" |
117 | test -f "$state_dir"/strategy_opts && | |
118 | strategy_opts="$(cat "$state_dir"/strategy_opts)" | |
b3e4847e MZ |
119 | test -f "$state_dir"/allow_rerere_autoupdate && |
120 | allow_rerere_autoupdate="$(cat "$state_dir"/allow_rerere_autoupdate)" | |
02ac45fa MZ |
121 | } |
122 | ||
84df4560 MZ |
123 | write_basic_state () { |
124 | echo "$head_name" > "$state_dir"/head-name && | |
125 | echo "$onto" > "$state_dir"/onto && | |
126 | echo "$orig_head" > "$state_dir"/orig-head && | |
7b37a7c6 MZ |
127 | echo "$GIT_QUIET" > "$state_dir"/quiet && |
128 | test t = "$verbose" && : > "$state_dir"/verbose | |
80ff4795 MZ |
129 | test -n "$strategy" && echo "$strategy" > "$state_dir"/strategy |
130 | test -n "$strategy_opts" && echo "$strategy_opts" > \ | |
131 | "$state_dir"/strategy_opts | |
b3e4847e MZ |
132 | test -n "$allow_rerere_autoupdate" && echo "$allow_rerere_autoupdate" > \ |
133 | "$state_dir"/allow_rerere_autoupdate | |
84df4560 MZ |
134 | } |
135 | ||
4974c2ca MZ |
136 | output () { |
137 | case "$verbose" in | |
138 | '') | |
139 | output=$("$@" 2>&1 ) | |
140 | status=$? | |
141 | test $status != 0 && printf "%s\n" "$output" | |
142 | return $status | |
143 | ;; | |
144 | *) | |
145 | "$@" | |
146 | ;; | |
147 | esac | |
148 | } | |
149 | ||
6fd2f5e6 | 150 | move_to_original_branch () { |
6fd2f5e6 JS |
151 | case "$head_name" in |
152 | refs/*) | |
153 | message="rebase finished: $head_name onto $onto" | |
154 | git update-ref -m "$message" \ | |
155 | $head_name $(git rev-parse HEAD) $orig_head && | |
53f2ffa8 JK |
156 | git symbolic-ref \ |
157 | -m "rebase finished: returning to $head_name" \ | |
158 | HEAD $head_name || | |
6fd2f5e6 JS |
159 | die "Could not move back to $head_name" |
160 | ;; | |
161 | esac | |
162 | } | |
163 | ||
fa99c1e1 | 164 | run_specific_rebase () { |
f8cca019 AE |
165 | if [ "$interactive_rebase" = implied ]; then |
166 | GIT_EDITOR=: | |
167 | export GIT_EDITOR | |
168 | fi | |
46df82d5 | 169 | . git-rebase--$type |
1b1dce4b JS |
170 | } |
171 | ||
d70b4a8f | 172 | run_pre_rebase_hook () { |
6bb4e485 | 173 | if test -z "$ok_to_skip_pre_rebase" && |
c4427656 | 174 | test -x "$GIT_DIR/hooks/pre-rebase" |
d70b4a8f | 175 | then |
bc2bbc45 SB |
176 | "$GIT_DIR/hooks/pre-rebase" ${1+"$@"} || |
177 | die "The pre-rebase hook refused to rebase." | |
d70b4a8f NS |
178 | fi |
179 | } | |
180 | ||
69a636ad | 181 | test -f "$apply_dir"/applying && |
9b752a6e SB |
182 | die 'It looks like git-am is in progress. Cannot rebase.' |
183 | ||
99de0640 MZ |
184 | if test -d "$apply_dir" |
185 | then | |
186 | type=am | |
187 | state_dir="$apply_dir" | |
188 | elif test -d "$merge_dir" | |
189 | then | |
190 | if test -f "$merge_dir"/interactive | |
191 | then | |
192 | type=interactive | |
193 | interactive_rebase=explicit | |
194 | else | |
195 | type=merge | |
196 | fi | |
197 | state_dir="$merge_dir" | |
198 | fi | |
199 | test -n "$type" && in_progress=t | |
200 | ||
95135b06 | 201 | total_argc=$# |
822f7c73 | 202 | while test $# != 0 |
e646c9c8 JH |
203 | do |
204 | case "$1" in | |
c4427656 | 205 | --no-verify) |
6bb4e485 | 206 | ok_to_skip_pre_rebase=yes |
c4427656 | 207 | ;; |
7baf9c4b | 208 | --verify) |
6bb4e485 | 209 | ok_to_skip_pre_rebase= |
7baf9c4b | 210 | ;; |
34262322 | 211 | --continue|--skip|--abort) |
45e2acf3 | 212 | test $total_argc -eq 2 || usage |
34262322 | 213 | action=${1##--} |
031321c6 | 214 | ;; |
e646c9c8 JH |
215 | --onto) |
216 | test 2 -le "$#" || usage | |
6bb4e485 | 217 | onto="$2" |
e646c9c8 JH |
218 | shift |
219 | ;; | |
45e2acf3 | 220 | -i) |
cf432ca0 MZ |
221 | interactive_rebase=explicit |
222 | ;; | |
45e2acf3 | 223 | -p) |
cf432ca0 MZ |
224 | preserve_merges=t |
225 | test -z "$interactive_rebase" && interactive_rebase=implied | |
226 | ;; | |
227 | --autosquash) | |
228 | autosquash=t | |
229 | ;; | |
230 | --no-autosquash) | |
231 | autosquash= | |
232 | ;; | |
45e2acf3 | 233 | -M|-m) |
58634dbf EW |
234 | do_merge=t |
235 | ;; | |
45e2acf3 MZ |
236 | -X) |
237 | shift | |
238 | strategy_opts="$strategy_opts $(git rev-parse --sq-quote "--$1")" | |
93ce190c | 239 | do_merge=t |
9765b6ab | 240 | test -z "$strategy" && strategy=recursive |
93ce190c | 241 | ;; |
45e2acf3 MZ |
242 | -s) |
243 | shift | |
244 | strategy="$1" | |
58634dbf EW |
245 | do_merge=t |
246 | ;; | |
45e2acf3 | 247 | -n) |
a9c3821c TAV |
248 | diffstat= |
249 | ;; | |
250 | --stat) | |
251 | diffstat=t | |
252 | ;; | |
45e2acf3 | 253 | -v) |
b758789c | 254 | verbose=t |
a9c3821c | 255 | diffstat=t |
0e987a12 SB |
256 | GIT_QUIET= |
257 | ;; | |
45e2acf3 | 258 | -q) |
0e987a12 SB |
259 | GIT_QUIET=t |
260 | git_am_opt="$git_am_opt -q" | |
261 | verbose= | |
262 | diffstat= | |
b758789c | 263 | ;; |
45e2acf3 MZ |
264 | --whitespace) |
265 | shift | |
266 | git_am_opt="$git_am_opt --whitespace=$1" | |
b2f82e05 | 267 | case "$1" in |
45e2acf3 | 268 | fix|strip) |
b2f82e05 SR |
269 | force_rebase=t |
270 | ;; | |
271 | esac | |
059f446d | 272 | ;; |
86c91f91 GB |
273 | --ignore-whitespace) |
274 | git_am_opt="$git_am_opt $1" | |
275 | ;; | |
570ccad3 MB |
276 | --committer-date-is-author-date|--ignore-date) |
277 | git_am_opt="$git_am_opt $1" | |
278 | force_rebase=t | |
279 | ;; | |
45e2acf3 MZ |
280 | -C) |
281 | shift | |
282 | git_am_opt="$git_am_opt -C$1" | |
67dad687 | 283 | ;; |
190f5323 TR |
284 | --root) |
285 | rebase_root=t | |
286 | ;; | |
45e2acf3 | 287 | -f|--no-ff) |
b2f82e05 SR |
288 | force_rebase=t |
289 | ;; | |
cb6020bb JH |
290 | --rerere-autoupdate|--no-rerere-autoupdate) |
291 | allow_rerere_autoupdate="$1" | |
292 | ;; | |
45e2acf3 MZ |
293 | --) |
294 | shift | |
e646c9c8 JH |
295 | break |
296 | ;; | |
297 | esac | |
298 | shift | |
299 | done | |
51b2ead0 | 300 | test $# -gt 2 && usage |
2db8aaec | 301 | |
cf432ca0 MZ |
302 | if test -n "$action" |
303 | then | |
304 | test -z "$in_progress" && die "No rebase in progress?" | |
2959c283 MZ |
305 | # Only interactive rebase uses detailed reflog messages |
306 | if test "$type" = interactive && test "$GIT_REFLOG_ACTION" = rebase | |
307 | then | |
308 | GIT_REFLOG_ACTION="rebase -i ($action)" | |
309 | export GIT_REFLOG_ACTION | |
310 | fi | |
cf432ca0 | 311 | fi |
34262322 MZ |
312 | |
313 | case "$action" in | |
314 | continue) | |
2959c283 MZ |
315 | # Sanity check |
316 | git rev-parse --verify HEAD >/dev/null || | |
317 | die "Cannot read HEAD" | |
34262322 MZ |
318 | git update-index --ignore-submodules --refresh && |
319 | git diff-files --quiet --ignore-submodules || { | |
320 | echo "You must edit all merge conflicts and then" | |
321 | echo "mark them as resolved using git add" | |
322 | exit 1 | |
323 | } | |
fa99c1e1 MZ |
324 | read_basic_state |
325 | run_specific_rebase | |
34262322 MZ |
326 | ;; |
327 | skip) | |
4974c2ca | 328 | output git reset --hard HEAD || exit $? |
fa99c1e1 MZ |
329 | read_basic_state |
330 | run_specific_rebase | |
34262322 MZ |
331 | ;; |
332 | abort) | |
333 | git rerere clear | |
fa99c1e1 | 334 | read_basic_state |
34262322 MZ |
335 | case "$head_name" in |
336 | refs/*) | |
ea69619c | 337 | git symbolic-ref -m "rebase: aborting" HEAD $head_name || |
34262322 MZ |
338 | die "Could not move back to $head_name" |
339 | ;; | |
340 | esac | |
4974c2ca | 341 | output git reset --hard $orig_head |
34262322 MZ |
342 | rm -r "$state_dir" |
343 | exit | |
344 | ;; | |
345 | esac | |
346 | ||
99de0640 MZ |
347 | # Make sure no rebase is in progress |
348 | if test -n "$in_progress" | |
7f4bd5d8 | 349 | then |
99de0640 MZ |
350 | die ' |
351 | It seems that there is already a '"${state_dir##*/}"' directory, and | |
352 | I wonder if you are in the middle of another rebase. If that is the | |
353 | case, please try | |
354 | git rebase (--continue | --abort | --skip) | |
355 | If that is not the case, please | |
356 | rm -fr '"$state_dir"' | |
9b752a6e | 357 | and run me again. I am stopping in case you still have something |
51ef1daa | 358 | valuable there.' |
7f4bd5d8 JH |
359 | fi |
360 | ||
cf432ca0 MZ |
361 | if test -n "$interactive_rebase" |
362 | then | |
363 | type=interactive | |
364 | state_dir="$merge_dir" | |
365 | elif test -n "$do_merge" | |
366 | then | |
367 | type=merge | |
368 | state_dir="$merge_dir" | |
369 | else | |
370 | type=am | |
371 | state_dir="$apply_dir" | |
372 | fi | |
373 | ||
190f5323 TR |
374 | if test -z "$rebase_root" |
375 | then | |
15a147e6 MZ |
376 | case "$#" in |
377 | 0) | |
378 | if ! upstream_name=$(git rev-parse --symbolic-full-name \ | |
379 | --verify -q @{upstream} 2>/dev/null) | |
380 | then | |
381 | . git-parse-remote | |
382 | error_on_missing_default_upstream "rebase" "rebase" \ | |
383 | "against" "git rebase <upstream branch>" | |
384 | fi | |
385 | ;; | |
386 | *) upstream_name="$1" | |
387 | shift | |
388 | ;; | |
389 | esac | |
190f5323 TR |
390 | upstream=`git rev-parse --verify "${upstream_name}^0"` || |
391 | die "invalid upstream $upstream_name" | |
190f5323 TR |
392 | upstream_arg="$upstream_name" |
393 | else | |
71786f54 | 394 | test -z "$onto" && die "You must specify --onto when using --root" |
190f5323 TR |
395 | unset upstream_name |
396 | unset upstream | |
46df82d5 | 397 | upstream_arg=--root |
190f5323 | 398 | fi |
32d99544 | 399 | |
a1bf91e0 | 400 | # Make sure the branch to rebase onto is valid. |
6bb4e485 | 401 | onto_name=${onto-"$upstream_name"} |
9f21e97d NS |
402 | case "$onto_name" in |
403 | *...*) | |
404 | if left=${onto_name%...*} right=${onto_name#*...} && | |
405 | onto=$(git merge-base --all ${left:-HEAD} ${right:-HEAD}) | |
406 | then | |
407 | case "$onto" in | |
408 | ?*"$LF"?*) | |
409 | die "$onto_name: there are more than one merge bases" | |
410 | ;; | |
411 | '') | |
412 | die "$onto_name: there is no merge base" | |
413 | ;; | |
414 | esac | |
415 | else | |
61dfa1bb | 416 | die "$onto_name: there is no merge base" |
9f21e97d NS |
417 | fi |
418 | ;; | |
419 | *) | |
71786f54 MZ |
420 | onto=$(git rev-parse --verify "${onto_name}^0") || |
421 | die "Does not point to a valid commit: $1" | |
9f21e97d NS |
422 | ;; |
423 | esac | |
a1bf91e0 | 424 | |
0cb06644 JH |
425 | # If the branch to rebase is given, that is the branch we will rebase |
426 | # $branch_name -- branch being rebased, or HEAD (already detached) | |
427 | # $orig_head -- commit object name of tip of the branch before rebasing | |
428 | # $head_name -- refs/heads/<that-branch> or "detached HEAD" | |
429 | switch_to= | |
59e6b23a | 430 | case "$#" in |
190f5323 | 431 | 1) |
0cb06644 | 432 | # Is it "rebase other $branchname" or "rebase other $commit"? |
190f5323 TR |
433 | branch_name="$1" |
434 | switch_to="$1" | |
0cb06644 | 435 | |
190f5323 | 436 | if git show-ref --verify --quiet -- "refs/heads/$1" && |
cb82a05d | 437 | orig_head=$(git rev-parse -q --verify "refs/heads/$1") |
0cb06644 | 438 | then |
190f5323 | 439 | head_name="refs/heads/$1" |
cb82a05d | 440 | elif orig_head=$(git rev-parse -q --verify "$1") |
0cb06644 JH |
441 | then |
442 | head_name="detached HEAD" | |
443 | else | |
34840db8 | 444 | die "fatal: no such branch: $1" |
0cb06644 | 445 | fi |
e646c9c8 JH |
446 | ;; |
447 | *) | |
0cb06644 | 448 | # Do not need to switch branches, we are already on it. |
bcf31618 JH |
449 | if branch_name=`git symbolic-ref -q HEAD` |
450 | then | |
0cb06644 | 451 | head_name=$branch_name |
bcf31618 JH |
452 | branch_name=`expr "z$branch_name" : 'zrefs/heads/\(.*\)'` |
453 | else | |
0cb06644 | 454 | head_name="detached HEAD" |
bcf31618 JH |
455 | branch_name=HEAD ;# detached |
456 | fi | |
cb82a05d | 457 | orig_head=$(git rev-parse --verify "${branch_name}^0") || exit |
e646c9c8 | 458 | ;; |
59e6b23a JH |
459 | esac |
460 | ||
8f9bfb64 MZ |
461 | require_clean_work_tree "rebase" "Please commit or stash them." |
462 | ||
cb82a05d MZ |
463 | # Now we are rebasing commits $upstream..$orig_head (or with --root, |
464 | # everything leading up to $orig_head) on top of $onto | |
e646c9c8 | 465 | |
1308c17b | 466 | # Check if we are already based on $onto with linear history, |
cc1453e1 MZ |
467 | # but this should be done only when upstream and onto are the same |
468 | # and if this is not an interactive rebase. | |
cb82a05d | 469 | mb=$(git merge-base "$onto" "$orig_head") |
cc1453e1 MZ |
470 | if test "$type" != interactive && test "$upstream" = "$onto" && |
471 | test "$mb" = "$onto" && | |
1308c17b | 472 | # linear history? |
cb82a05d | 473 | ! (git rev-list --parents "$onto".."$orig_head" | sane_grep " .* ") > /dev/null |
7f4bd5d8 | 474 | then |
b2f82e05 SR |
475 | if test -z "$force_rebase" |
476 | then | |
477 | # Lazily switch to the target branch if needed... | |
3b21a438 | 478 | test -z "$switch_to" || git checkout "$switch_to" -- |
0e987a12 | 479 | say "Current branch $branch_name is up to date." |
b2f82e05 SR |
480 | exit 0 |
481 | else | |
0e987a12 | 482 | say "Current branch $branch_name is up to date, rebase forced." |
b2f82e05 | 483 | fi |
7f4bd5d8 JH |
484 | fi |
485 | ||
8f9bfb64 MZ |
486 | # If a hook exists, give it a chance to interrupt |
487 | run_pre_rebase_hook "$upstream_arg" "$@" | |
488 | ||
a9c3821c TAV |
489 | if test -n "$diffstat" |
490 | then | |
491 | if test -n "$verbose" | |
492 | then | |
493 | echo "Changes from $mb to $onto:" | |
494 | fi | |
495 | # We want color (if set), but no pager | |
496 | GIT_PAGER='' git diff --stat --summary "$mb" "$onto" | |
497 | fi | |
498 | ||
fa99c1e1 | 499 | test "$type" = interactive && run_specific_rebase |
f4107d9c MZ |
500 | |
501 | # Detach HEAD and reset the tree | |
502 | say "First, rewinding head to replay your work on top of it..." | |
503 | git checkout -q "$onto^0" || die "could not detach HEAD" | |
cb82a05d | 504 | git update-ref ORIG_HEAD $orig_head |
f4107d9c | 505 | |
e646c9c8 | 506 | # If the $onto is a proper descendant of the tip of the branch, then |
a75d7b54 | 507 | # we just fast-forwarded. |
cb82a05d | 508 | if test "$mb" = "$orig_head" |
32d99544 | 509 | then |
0e987a12 | 510 | say "Fast-forwarded $branch_name to $onto_name." |
6fd2f5e6 | 511 | move_to_original_branch |
32d99544 LS |
512 | exit 0 |
513 | fi | |
514 | ||
190f5323 TR |
515 | if test -n "$rebase_root" |
516 | then | |
517 | revisions="$onto..$orig_head" | |
518 | else | |
519 | revisions="$upstream..$orig_head" | |
520 | fi | |
521 | ||
fa99c1e1 | 522 | run_specific_rebase |