[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gits] Git Workflow
- Subject: [gits] Git Workflow
- From: eeide at cs.utah.edu (Eric Eide)
- Date: Mon, 3 Jun 2013 17:05:13 -0600
- In-reply-to: Kirk Webb's message of Monday, June 3 2013 <CAHhYwBgf+HJD+U8eY2Dtr6qf=PrSu=_mTRfuGGc_P9xZmedQDA@mail.gmail.com>
- References: <CAHhYwBjm2U1J0TxhGAtcofh=9AtvEaAnQQb95-eK1XoBVRRDEw@mail.gmail.com> <20908.61144.355217.425563@bas.flux.utah.edu> <CAHhYwBgf+HJD+U8eY2Dtr6qf=PrSu=_mTRfuGGc_P9xZmedQDA@mail.gmail.com>
Kirk> I reckoned that moving commits/history around like this wouldn't
Kirk> be pretty.
It makes you feel like a Time Lord.
>> 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.
Eric.
--
-------------------------------------------------------------------------------
Eric Eide <eeide at cs.utah.edu> . University of Utah School of Computing
http://www.cs.utah.edu/~eeide/ . +1 (801) 585-5512 voice, +1 (801) 581-5843 FAX