Yes, anything that results in the same result is obviously the same :) I was not arguing against David's steps. I was emphasizing the history situation.
Linear history = good. Don't read too far into specific Git commands or Git command bans. I'm not looking for any of that. I wanted to push the discussion to proper history management. For me that is easiest with normally doing a rebase, so most small commits want that end result behavior. If you want to squash or git fu commits anyway you want for the same result, no one will even know ;) - Mark On Tue, Jan 19, 2016 at 5:55 PM Tomás Fernández Löbbe <tomasflo...@gmail.com> wrote: > My understanding is that squashed merges also keep the linear history. You > do loose the branch commit history, but if that's not something you are > interested in keeping that should be fine, right? That's the workflow that > Dawid proposed and it's the one I've been using so far with git. > > Tomás > > -- - Mark about.me/markrmiller
