diff options
Diffstat (limited to 'rebase_damon_next_on_mm_unstable.sh')
| -rwxr-xr-x | rebase_damon_next_on_mm_unstable.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rebase_damon_next_on_mm_unstable.sh b/rebase_damon_next_on_mm_unstable.sh index b46b6b5..17db21f 100755 --- a/rebase_damon_next_on_mm_unstable.sh +++ b/rebase_damon_next_on_mm_unstable.sh @@ -46,17 +46,17 @@ cp "$bindir/unmerged_commits.sh" ./ merged_commits=$(./unmerged_commits.sh --merged --human_readable \ "$old_mm_unstable..damon/next" "$mainline_base..$new_mm_unstable") +git branch -M damon/next damon/next.old git checkout akpm.korg.mm/mm-unstable -b damon/next.new commits_to_pick=$(./unmerged_commits.sh "$old_mm_unstable..damon/next" \ "$mainline_base..$new_mm_unstable") if ! git cherry-pick --allow-empty $commits_to_pick then echo "Cherry-pick failed." - echo "Rename damon/next.new to damon/next after resolving the issue" + echo "Resolve it and do 'git branch -M damon/next.new damon/next'" exit 1 fi -git branch -M damon/next damon/next.old git branch -M damon/next.new damon/next echo "Below commits have merged" |