OK git gurus, this is something I have not figured out: the best way to
add acked-by (or additional signed-off-by) lines to git patches.
What I'm talking about is when I've applied a patch to my repo and
published the change on the list and get an "acked-by" back. By the
time I get the ack, the acked patch may be several patches deep. My
current technique is to reset the repo, edit the patch(es) to add the
"acked-by" lines, and then re-apply the patches. PITA and probably the
stupidest way.
Stacked git should work (effectively does the same thing but more
gracefully), but I have not gone that route yet.
There must be a better way, if only I could find the right (of 137)
git-* command...
Hints, please?
Thanks,
gvb
On 12/08/2007 09:21 PM, Jerry Van Baren wrote:
OK git gurus, this is something I have not figured out: the best way to
add acked-by (or additional signed-off-by) lines to git patches.
What I'm talking about is when I've applied a patch to my repo and
published the change on the list and get an "acked-by" back. By the
time I get the ack, the acked patch may be several patches deep. My
current technique is to reset the repo, edit the patch(es) to add the
"acked-by" lines, and then re-apply the patches. PITA and probably the
stupidest way.
Stacked git should work (effectively does the same thing but more
gracefully), but I have not gone that route yet.
There must be a better way, if only I could find the right (of 137)
git-* command...
I keep patches in a repo. I just update the patch header and commit.
-Geoff
On 12/8/07, Jerry Van Baren [off-list ref] wrote:
Stacked git should work (effectively does the same thing but more
gracefully), but I have not gone that route yet.
This is my preferred solution, but you don't have to do it this way.
There must be a better way, if only I could find the right (of 137)
git-* command...
Try git-cherry-pick. Get a list of the SHA-1 patch ids and reset your
branch. Then cherry pick each patch with the -e flag. Git will pull
up an editor and let you edit the commit message before applying so
you can add the Acked-by line.
Cheers,
g.
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
grant.likely@secretlab.ca
(403) 399-0195
On Sun, 09 Dec 2007 00:21:05 -0500 Jerry Van Baren [off-list ref] wrote:
OK git gurus, this is something I have not figured out: the best way to
add acked-by (or additional signed-off-by) lines to git patches.
Have a look at "git rebase -i"
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/