From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 11 Jan 2008 12:10:37 GMT
Subject: Re: [PATCH] Use commit template when cherry picking
Message-ID: <alpine.LSU.1.00.0801111208020.31053@racer.site>
In-Reply-To: <20080111074505.GC14022@plexity.net>

Hi,

On Thu, 10 Jan 2008, Deepak Saxena wrote:

> We are using git to manage our kernel tree and we often cherry-pick 
> patches from upstream and while we want to save the original commit 
> message, we also want to apply our default commit header to the log. If 
> this patch is not the ideal solution, please let me know how I should go 
> about this.

I would do a combination of "cherry-pick -n", "cat-file commit <commit> | 
sed '1,/^$/d'" and "commit -F" or "commit -f".

You can make this an alias, too.

Hth,
Dscho