Hacker Newsnew | past | comments | ask | show | jobs | submitlogin

Both merge and rebase, but no cherry-pick. Goodbye then, I guess.

I've seen a dozen of those tools wishing to "simplify" git and they all fail my workflow, which is pretty common I guess, team git with central server and source control.

What I use:

    git push with target

    git fetch

    git checkout

    git cherry-pick

    git reflog

    git log, status, diff obviously.


The difference between rebase and cherry pick is very very slim, rebase is in a sense just a convenience frontend for cherry-pick..


For rebase I can never figure out what should go in all its parameters. It has defaults sure, that are impossible to figure out either.

With cherry-pick you have no parameters and no defaults, it's basically cp <commit> . for SCM.


Why git cherry-pick rather than just fast-forward or rebase? Doesn't that introduce a whole bunch of duplicate commits?


I don't care about any commits that are not under code review. If I have fifty duplicate commits on different branches in my local, that's okay with me.

Fast-forward doesn't work usually, and rebase is confusing compared to cherry-pick.




Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact

Search: