-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 08/12/2010 09:27 PM, Yury G. Kudryashov wrote: >>> Why rebase? In git you can merge with upstream. This will create a tree >>> like this (parent -> child): >>> >>> a -> b -> c; >>> a -> d; >>> c -> e; d -> e; >> >> Many projects encourage (not to say require) rebasing > I consider it a misuse of git.
But that allows to have a cleaner master/ branch history. Also that makes it easier to send patches against current head. This is widespread enough that ease of rebasing was an argument that a user gave to Pidgin.im project to migrate from Monotone to Git (If they even wanted this feature, cherry-picking would be enough). Of course, he got just sent away. As we can see in http://marc.info/?l=git&m=116129092117475 , rebasing is not a Git misuse: Git "right way of use" is what is convenient for Linux Kernel development, and it evolved to include rebase. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBAgAGBQJMZDLtAAoJEE6tnN0aWvw32qQIAJ414BoKfjIwAfQQJL3GmSYi 02Y/MjUB0DKSBlTjvWcsrDNET4C2vU65WvTQieZmGEzUSu/XCT1apQxDpMjlFzSm iAR2Dqo6B3i6pbarfJupaizsXoCGAK56x9YCV0B/qy9puuTxVEGwFDeDaGvgz3VW 6nP0ElVR5Uwhn/mwj/2uArzqcWLoa7G/p+9JfoE6B3xbE3BgOsIrnoemj4UjMWGt OiL9MenzJkh7g3vr4LnVTXtm/F2DE+kWHZlchv/d7MO0+X91xGKwycK8GwJP8ceH +jGKV1y9UY1gUrRy06mn2xQDrB6lpFmwQwf0q0aqHLDWu8alRD6SYaqd7IAY0Vc= =PEp7 -----END PGP SIGNATURE----- _______________________________________________ nix-dev mailing list [email protected] https://mail.cs.uu.nl/mailman/listinfo/nix-dev
