2009/3/31 Christoph Höger <choeger@xxxxxxxxxxxxxxx>: > 1. clone upstream, create another local branch, work there, and then > merge that branchs changes via diff? > > 2. use <UNKNOWN_GIT_COMMAND> to merge those commits into a single one? use git-merge --squash This will get merge the changes but will not commit , so that you can commit all in one go. > > 3. do not use intermdiate local commits (bad idea) > Kushal -- http://fedoraproject.org http://kushaldas.in -- fedora-devel-list mailing list fedora-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/fedora-devel-list
