GIT cherry Pick operation using Stash

[Mohan Krishnan]

Hello ,

Does stash support's git cherry pick operation in its hosted repositories ? We want to keep our

commit history linear and clean . Merge operation results in a merge bubble and we want to avoid such scenarios . I think only way to merge branches in stash is pull request and it provides only a merge option hence creating a non linear history.

Regards,

Mohan

[seb]

Whilst the argument for keeping a commit history linear is probably moot here (we don't recommend it, but that's another story), Stash doesn't support an inbuilt method for keeping history linear, via cherry picking or via rebasing pull requests when accepting them.

You can follow this request for more details: https://jira.atlassian.com/browse/STASH-2874

[Mohan Krishnan]

But we can still cherry pick commits or rebase using command line in a stash hosted git reposiotry rite , using the git native commands?

[seb]

Yes, but a pull request will not be marked as "merged". The fastest way to get these answers it to give Stash a trial run and test it.

[Mohan Krishnan]

Ok ... Can we mandate ff and no-ff merge strategies for a pull request merge?

[seb]

--no-ff is the default for pull requests. See https://jira.atlassian.com/browse/STASH-2857 for forcing --ff

[Mohan Krishnan]

i got confused since i was not able to locate STASH-2857 in Stash 2.1.0 release notes. Jira indicates this as closed with fix version 2.1.0