is was wondering if there is the possibility to create a customized git log. We are working with different version and bugfix branches in git and need to know, which of the commits haven't been cherry picked from the bugfix to the version branch.
Via the command line it goes like this:
git log --cherry-pick --oneline --no-merges branch1...branch2
Sorry, you can't add extra options to the log display right now. A couple of things that may or may not help:
I've added a feature request for more log filtering options: https://jira.atlassian.com/browse/SRCTREE-1261
FWIW, I've always organised bugfix / release branches so that you there's no need to cherry-pick (unless someone commits to the wrong branch), since bugfix branches are always merged forward wholesale into the main development branch, rather than cherry-picking bugfixes back into the fix branch. This is also how git-flow recommends that you work.
Thank you. I certainly agree with you that this is be best workflow. Unfortunaltely our workflow isn't like that. We've only got "huge" versions (like 1, 2, 3, 4) and especially bugfixes need to be cherry-picked from the main development branch into the older versions.
It's like this:
master -> bugfix_version_1 -> version_1
In the bugfix branch the commits are checked and eventually cherry-picked into the older version. With a lot of versions and developers it's hard to keep track. And the command I posted above works fine to determine which of the bugfixes ain't in the version.
If I would be able to get this in the search view it would help a lot.
Yahoo engineers are still working on improvements throughout all yahoo sites and some avatars may be slow to show (it could even be a day or so) so try to be patient.
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot