Commit Graph

6 Commits (e71b6f90de62feb4f0a409ac442450e153c3d0f2)

Author SHA1 Message Date
Zach Loafman 180a38c181 hack/cherry_pick_pull.sh: Allow multiple pulls
Reorder the arguments to allow for multiple pulls at the end:
  hack/cherry_pick_pull.sh <remote branch> <pr-number>...

This solves some common A-then-immediate-A' cases that appear
frequently on head. (There's a workaround, but it's a hack.) Updates
the documentation.
2015-07-13 07:11:12 -07:00
Wojciech Tyczynski b33954c45e Merge pull request #10963 from thockin/cherrypick-fixes
Ignore untracked files in cherrypick
2015-07-09 11:28:11 +02:00
Zach Loafman 1d6db553b0 Fix two issues in cherry_pick_pull:
* Ignore errexit in trap handler
* Check for branch (since two people have complained now..)
2015-07-08 18:16:27 -07:00
Tim Hockin b61985ad87 Ignore untracked files in cherrypick 2015-07-08 17:09:14 -07:00
Zach Loafman 390bb58f48 Brendan noticed this silly inconsistency. 2015-07-08 11:53:33 -07:00
Zach Loafman 4f3accec00 Add cherry_pick_pull.sh <pr-number> <branch>
This script checks out a branch based on <branch>, cherry picks pull
request <pr> into it commit by commit, then instructs the user on how
to propose that branch as a PR to the branch.

For bonus points, this could be integrated with something like the
"hub" tool (https://github.com/github/hub) and be made about 2x more
automated.

Fixes #10730
2015-07-08 11:15:28 -07:00