That is it indeed :)
--- Regards, Jonathan Aquilina Founder Eagle Eye T On 2014-09-16 11:58, Dimiter Naydenov wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > On 16.09.2014 12:32, Jonathan Aquilina wrote: > >> I dont think you have to rebase though. I think you can squash multiple commits together. > > You're probably thinking about git commit --amend -m "msg", which > folds the current changeset into the one before it, effectively > squashing the uncommitted changes onto the same revision ID, and > changing the commit message. > >> --- Regards, Jonathan Aquilina Founder Eagle Eye T On 2014-09-16 11:27, roger peppe wrote: >> >>> On 16 September 2014 09:22, Jonathan Aquilina <jaquil...@eagleeyet.net [1]jaquil...@eagleeyet.net>> wrote: >>> >>>> If i am not mistaken if you have multiple commits in a branch git has something built in called git squash. This obviously eliminates the 5 step process into one merge and one push. >>> I don't see that command. Are you thinking of the "squash" functionality of rebase -i? FWIW, I never run those five steps in sequence together. Usually I just get to a situation where I know that I have all tests passing and I'm up to date with master (for example I've done a merge some time ago, probably before fixing a bunch of tests). Then it's just: $ git reset upstream/master $ git commit -am 'my commit message' which is usually quicker than running rebase -i, and much quicker if the rebase replay leads to conflicts. cheers, rog. > > - -- > Dimiter Naydenov <dimiter.nayde...@canonical.com> > juju-core team > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1 > > iQEcBAEBAgAGBQJUGAm+AAoJENzxV2TbLzHwH74IAIUUxdHCS2KTvTNPRRAZt9F1 > r3/gLD/guBbicVuE/p7Ghj/DirmjuLDF8ZndmWO8EeIVye3ikw204lFklfpx4uSh > Qik5Mp+JPrFZ1u78n8EKhvh7gX+FytKooFSdUHjPfkxPTVZ2Rxg/LyXJSsp3WlvJ > G+wgx01gKztqaE37EhFQkYoE1+ULUm8phOTS6UhzVMiaRr+x7u4oL1M0i48+FHvC > R6KHBq0zoxijLxRgN7jfKpavPEIrCPEjTB/zOBN9NONKhVABlIU3HWb5JtBA+vVV > TbpmpKOSKdS7hNMnr2D/phKK62TxEpefHszmKWzuR/JWmq5cC7lEFwjUbUV8nFg= > =vcVP > -----END PGP SIGNATURE----- Links: ------ [1] mailto:jaquil...@eagleeyet.net
-- Juju-dev mailing list Juju-dev@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/juju-dev
