News for hackers. Stuff that matters.
Re:git cascade and git forward-merge by maaaats on Tuesday April 01, 2014 @09:12AM (#7507799)
How would one normally achieve the effect of the git forward-merge in the command line?

My IDE usually does that for me, so never really considered it an issue to change branch with an unclean tree.

Re:git cascade and git forward-merge by cool-RR on Tuesday April 01, 2014 @09:16AM (#7507838)
I think you'd have to check out the target branch (stashing any changes if you had them), do `git merge source_branch`, and then check out the original branch you were on, and pop stash if you saved one.

Alternatively if the merge is a simple fast-forward you can just do `git push . source:destination`, which is what `git forward-merge` does in that case too.

Re:git cascade and git forward-merge by freshprince on Tuesday April 01, 2014 @09:16AM (#7507835)
Works only for fast-forward merges:

    git fetch origin master:master