Le 12/08/2010 21:55, Bruno Wolff III a écrit : > I like to avoid having merges appear upstream if they aren't really > necessary. I think there is a way to do a merge with upstream to > your local repo so that when you do the push it looks like just new > commits were added without a merge. But I don't remember the command > right now.
Are you thinking about "git rebase"? "rebase" is the "replay" command: it tries to replay/relocate all your local commits on top of a moving head (typically: the upstream head). You need git rebase when you want a linear history; it is the "anti-merge" / "anti-diamond" command. You need to run "git fetch" first. "git help rebase" has nice diagrams, no real need to google (but it does not hurt). git rebase --interactive is also great to rewrite your own, local, private history, but this is another story. -- livecd mailing list [email protected] https://admin.fedoraproject.org/mailman/listinfo/livecd
