Skip to content

Conversation

Fishrock123
Copy link
Contributor

(also adds --bail to stop if a commit doesn’t apply rather than skipping
it)

Allows us to have branch-diff apply commits directly, rather than having to grab each hash and cherry pick it.

While range-cherry-picking worked for a while, it has become increasing difficult as we are ignoring more commits. This was the obvious approach from my point of view.

also adds --bail to stop if a commit doesn’t apply rather than skipping
it
@rvagg
Copy link
Member

rvagg commented Jan 12, 2016

I'd prefer to leave branch-diff as an output-only tool rather than an active player. Can we explore a -q option (or similar) to just print out commits to stdout so it can be piped to xargs git cherry-pick perhaps?

@Fishrock123
Copy link
Contributor Author

Can we explore a -q option (or similar) to just print out commits to stdout so it can be piped to xargs git cherry-pick perhaps?

I guess? I didn't even know xargs existed, so this worked at the time. I'll leave this PR to you to decide what to do, and open a new one.

@Fishrock123 Fishrock123 mentioned this pull request Jan 12, 2016
@rvagg
Copy link
Member

rvagg commented Jan 14, 2016

gone with the other one, I likee

@rvagg rvagg closed this Jan 14, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants