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