diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-27 14:58:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-27 14:58:08 -0800 |
| commit | 2b0a564e02528e006d23e3318d0d2869fb239425 (patch) | |
| tree | 76f46ae7b059ac9ca0e8b725fa67f89a3c078f16 /git-rebase.sh | |
| parent | e9ecee0423f2b24eb4e51d337044721c761cb4c3 (diff) | |
| parent | ad8261d21221d27638c75f47b39892db6f7972f6 (diff) | |
Merge branch 'jk/pull-rebase-using-fork-point'
* jk/pull-rebase-using-fork-point:
rebase: use reflog to find common base with upstream
pull: use merge-base --fork-point when appropriate
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 226752fbff..7185dc8438 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -14,6 +14,7 @@ git-rebase --continue | --abort | --skip | --edit-todo v,verbose! display a diffstat of what changed upstream q,quiet! be quiet. implies --no-stat autostash! automatically stash/stash pop before and after +fork-point use 'merge-base --fork-point' to refine upstream onto=! rebase onto given branch instead of upstream p,preserve-merges! try to recreate merges instead of ignoring them s,strategy=! use the given merge strategy @@ -66,6 +67,7 @@ verbose= diffstat= test "$(git config --bool rebase.stat)" = true && diffstat=t autostash="$(git config --bool rebase.autostash || echo false)" +fork_point=auto git_am_opt= rebase_root= force_rebase= @@ -260,6 +262,12 @@ do --no-autosquash) autosquash= ;; + --fork-point) + fork_point=t + ;; + --no-fork-point) + fork_point= + ;; -M|-m) do_merge=t ;; @@ -437,6 +445,8 @@ then error_on_missing_default_upstream "rebase" "rebase" \ "against" "git rebase <branch>" fi + + test "$fork_point" = auto && fork_point=t ;; *) upstream_name="$1" shift @@ -522,6 +532,15 @@ case "$#" in ;; esac +if test "$fork_point" = t +then + new_upstream=$(git merge-base --fork-point "$upstream_name" "$switch_to") + if test -n "$new_upstream" + then + upstream=$new_upstream + fi +fi + if test "$autostash" = true && ! (require_clean_work_tree) 2>/dev/null then stash_sha1=$(git stash create "autostash") || |