Hi, I really don't find how I have to cherry pick, I'm pretty new to GIT (and SourceTree) and I would like to push certain files (or changes) to one or multiple branches. I don't want to merge completely. So how do I do this with SourceTree?
Thanks!
In the log view (Cmd-2), just select one or more commit lines (Cmd-click or Shift-click multi-selects), then right-click and select 'Cherry pick'.
Is there a way to included the SHA of the picked commit in the comment, the way git cherry-pick -x does?
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Not right now - at the time this feature was added, the -x behaviour was the default but it's been changed in git since to be an opt-in. i"ll add it to the feature requests.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Hi, what about cherry picking without committing? (git cherry-pick -n)
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Re cherry-picking. I find that if I try to cherry-pick more than one commit at the same time which includes the tip of a branch, then the cherry-pick action fails with a message saying that a cherry-pick is already 'in progress'. Is this a bug?
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
+1 for the feature requests:
cherry picking without committing immediately - https://jira.atlassian.com/browse/SRCTREE-1026
including SHA in the commit message - https://jira.atlassian.com/browse/SRCTREE-1228
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Selecting multiple doesn't appear to work actually. The confirmation message clearly says "the selected change", i.e., not plural. So I think you'll be doing it one at a time.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
nice
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
If I select more than one commit then the Cheery pick option is greyed out. Tried with two commits - select each one separately and I get the option to cherry pick, select both and I don't. They are two consecutive revisions on the same branch...
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
exactly my problem.
Whats the solution to this problem tho?
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Apparently this isn't supported! See https://community.atlassian.com/t5/Sourcetree-questions/Cherry-pick-multi-commits-but-the-cherry-pick-optionis-disabled/qaq-p/859356 Seems like pretty basic functionality to me
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
adam - page not found with that link.
In any case, I can't see a cherrypick option in the menu...
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.