3 master_sha1=`git rev-parse --verify refs/heads/master`
6 (cd .git/refs/heads && find -type f) |
9 -e '/^[^\/][^\/]\//p' |
12 rebase= done= not_done= trouble= date=
13 topic_sha1=`git rev-parse --verify "refs/heads/$topic"`
16 git-rev-list -1 --pretty "$topic" |
17 sed -ne 's/^Date: *\(.*\)/ (\1)/p'
19 only_next_1=`git-rev-list ^master "^$topic" next | sort`
20 only_next_2=`git-rev-list ^master next | sort`
22 if test "$only_next_1" = "$only_next_2"
24 not_in_topic=`git-rev-list "^$topic" master`
25 if test -z "$not_in_topic"
27 :; # already up-to-date.
29 rebase=" (can be rebased)"
34 echo "Rebasing $topic to pick up:"
35 git-rev-list --pretty=oneline "^$topic" master |
36 sed -e 's/^[0-9a-f]* / * /'
37 git checkout "$topic" &&
38 git rebase master || break;