On Tue, Jun 25, 2013 at 03:13:18PM -0700, Alan Coopersmith wrote: > To resync with HEAD, I use "git pull --rebase". > > To merge patches, or change previous ones, I use "git rebase -i origin", > especially with the "squash" and "fixup" options (or "reword" if I'm > just adding reviewed-by tags & similar commit comment changes). > > http://git-scm.com/book/en/Git-Tools-Rewriting-History > https://help.github.com/articles/interactive-rebase
Thank you for the help! I've resent the two modified patches after rebasing. Thomas _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
