It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

SourceTree - How do I cherry pick?

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!

1 answer

1 accepted

21 votes
Answer accepted

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?

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.

Hi, what about cherry picking without committing? (git cherry-pick -n)

Like Bill Beacom likes this

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?

+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

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.

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...

Like Victor Ionescu likes this

exactly my problem. 

 

Whats the solution to this problem tho?

adam - page not found with that link.

In any case, I can't see a cherrypick option in the menu...

 

Suggest an answer

Log in or Sign up to answer
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

1,687 views 0 10
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you