Re: Code review tool? (and [PATCH] fix for stencil rotating)

[Reinhold Kainhofer]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Am Donnerstag, 11. September 2008 schrieb Patrick McCarty:
> On Thu, Sep 11, 2008 at 12:32 PM, Reinhold Kainhofer
>
> <address@hidden> wrote:
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA1
> >
> > Am Mittwoch, 10. September 2008 schrieb Carl D. Sorensen:
> >> I've been using a bunch of local commits to track my changes, then using
> >> git-rebase to squash them into a single change before I push.  If you do
> >> this, then the rebase commit will fly through, won't it?
> >>
> >> Is this a wrong thing to do?  I've thought it worked well for me.
> >
> > It's fine, that's also how I do it. However, git-rebase does not squash
> > them into a single commit, but tries to preserve all commits as you
> > committed them. So your branch will still have multiple commits...
>
> git-rebase -i gives you the option to squash commits, edit them,
> change their order, etc.  You should try it out!

Ah, cool. Most of the time, a "git commit --amend" suffices for me, though, to 
prevent unnecessary multiple commits in the first place.

Cheers,
Reinhold

- -- 
- ------------------------------------------------------------------
Reinhold Kainhofer, Vienna University of Technology, Austria
email: address@hidden, http://reinhold.kainhofer.com/
 * Financial and Actuarial Mathematics, TU Wien, http://www.fam.tuwien.ac.at/
 * K Desktop Environment, http://www.kde.org, KOrganizer maintainer
 * Chorvereinigung "Jung-Wien", http://www.jung-wien.at/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFIyZP7TqjEwhXvPN0RAvkUAJ48ZJ1J1pQEA8kUauy5d8OUccPj1wCgq8Gz
gyCrvyXe/GZoyRrRBmHPGFM=
=8Vvz
-----END PGP SIGNATURE-----