Can anyone point me to documentation on why Git fast-forwards a merge commit when you pull with the rebase strategy? https://github.com/Wikia/app/commit/fae31ad1291c6bb57be6a8f68f144c1140822be9 …
@languagehacker it fast forwards if there's no changes to rebase. what else woul it do?
-
-
@bascule git pull --rebase will turn an unpushed merge commit into a fast-forward merge. See http://stackoverflow.com/questions/11863785/make-git-pull-rebase-preserve-merge-commits … -
@languagehacker oh fun! I think the real answer is most people using a rebase workflow probably want it for a linear history -
@bascule Really? If you're doing ticket or feature work in branches, you want to be able to revert the entire merge in one shot. -
@languagehacker yeah, people doing that mostly use a standard merge workflow and rebase locally immediately prior to merging -
@bascule If you have a highly active origin, though, it's more frequent pain than edge case. Manual fetch & rebase --preserve-merges works. -
@languagehacker we have a highly active origin :) Our general workflow is pull master, rebase your feature branch, send PR, squash merge -
@bascule Interesting. We're trying to implement a take on http://nvie.com/posts/a-successful-git-branching-model/ …. We want the clear history and atomicity merge commits offer. -
@languagehacker sounds like you want a quick way to rollback a feature? The easiest way to do that is to squash :| - 2 more replies
New conversation -
Loading seems to be taking a while.
Twitter may be over capacity or experiencing a momentary hiccup. Try again or visit Twitter Status for more information.