[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gits] Git Workflow

On Mon, Jun 3, 2013 at 5:05 PM, Eric Eide <eeide at cs.utah.edu> wrote:

>         >> Another alternative: squash the changes into a single commit, then
>         >> remove the files that aren't ready to be pushed (saving them
>         >> elsewhere), then "git commit --amend".
>         Kirk> That could work, though you would lose some commit history, yes?
> Yes, a squash commit loses the histoy of the individual commits that are
> squashed together.  Sometimes this is what you want.  I mean, who cares if the
> history that would be preserved is something like:
>         Commit big new feature!
>         Fix bug.
>         Fix bug.
>         Fix bug.
>         Fix another bug.
>         Fix yet another bug.

Right - just making sure I understood what you were saying.  You might
care if there were other interim 'milestone' commits you wanted to preserve.
Not sure if that's the case here.  So much speculation! :-)