On Sun, Feb 22, 2009 at 9:41 PM, Bryan Ischo <bji-keyword-pacman.3644cb@www.ischo.com> wrote:
Bryan Ischo wrote:
Thanks for the tip. So using git-rebase is the better way to incorporate feedback into patches? It's not just that I'm trying to make my existing patches apply cleanly on some other branch. It's that I have to 'redo' the changes because I have to incorporate feedback and make modifications to the changes from which the patches originally were derived. So git-rebase will help me with this?
I've used git-rebase before, but only to bring unmodified patches from one branch to another, or from one part of a branch to another part (once I have sent out patches and they haven't gone into the official git repository yet, I use git-rebase in my own git tree to occasionally bring the patches forward past all of the changes that I pull in from the master repository, so that I can be sure that they would cleanly apply without changes to the master repository), but I've never considered using it to allow me to re-stage patches and modify them in place.
OK so I've played with git-rebase a little bit and I can see how it's better than git-merge for getting changes into a new branch so that they can be modified. But I think I'd still have to do "git reset HEAD^" and then modify my changes and check the modifications in, and all the other steps, right?
I am sure you read the wiki, right? :) http://wiki.archlinux.org/index.php/Pacman_Development Before using the git cheat sheet, it is highly recommended to read the Super_Quick_Git_Guide http://wiki.archlinux.org/index.php/Super_Quick_Git_Guide http://wiki.archlinux.org/index.php/Super_Quick_Git_Guide#Fixing_your_patch