Skip to content


Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Fetching contributors…

Cannot retrieve contributors at this time

executable file 56 lines (47 sloc) 1.378 kb
# Copyright (c) 2005 Junio C Hamano.
. git-sh-setup
# Make sure we do not have .dotest
if mkdir .dotest
rmdir .dotest
echo >&2 '
It seems that I cannot create a .dotest directory, and I wonder if you
are in the middle of patch application or another rebase. If that is not
the case, please rm -fr .dotest and run me again. I am stopping in case
you still have something valuable there.'
exit 1
# The other head is given. Make sure it is valid.
other=$(git-rev-parse --verify "$1^0") || exit
# Make sure we have HEAD that is valid.
head=$(git-rev-parse --verify "HEAD^0") || exit
# The tree must be really really clean.
git-update-index --refresh || exit
diff=$(git-diff-index --cached --name-status -r HEAD)
case "$different" in
?*) echo "$diff"
exit 1
# If the branch to rebase is given, first switch to it.
case "$#" in
git-checkout "$2" || exit
# If the HEAD is a proper descendant of $other, we do not even need
# to rebase. Make sure we do not do needless rebase. In such a
# case, merge-base should be the same as "$other".
mb=$(git-merge-base "$other" "$head")
if test "$mb" = "$other"
echo >&2 "Current branch `git-symbolic-ref HEAD` is up to date."
exit 0
# Rewind the head to "$other"
git-reset --hard "$other"
git-format-patch -k --stdout --full-index "$other" ORIG_HEAD |
git am --binary -3 -k
Jump to Line
Something went wrong with that request. Please try again.