Re: How to rebase when some commit hashes are in some commit messages

2015-10-18 Thread Ævar Arnfjörð Bjarmason
On Mon, Oct 12, 2015 at 9:59 PM, Francois-Xavier Le Bail wrote: > Hello, > > [I try some search engines without success, perhaps I have missed something]. > > For example, if I rebase the following commits, I would want that if > the commit hash 222... become

Re: How to rebase when some commit hashes are in some commit messages

2015-10-18 Thread Thomas Koch
On Thursday 15 October 2015 09:44:59 Francois-Xavier Le Bail wrote: > >> On Tue, 13 Oct 2015 10:50:40 +0200 > >> Francois-Xavier Le Bail wrote: > >>> >> For example, if I rebase the following commits, I would want that > >>> >> if the commit hash 222... become

Re: How to rebase when some commit hashes are in some commit messages

2015-10-16 Thread Philip Oakley
From: "Johannes Schindelin" Hi Francois-Xavier, On Thu, 15 Oct 2015, Francois-Xavier Le Bail wrote: On 13/10/2015 15:29, Philip Oakley wrote: > Thus the only sha1 numbers that could be used are those that are > within the (possibly implied) instruction sheet

Re: How to rebase when some commit hashes are in some commit messages

2015-10-15 Thread Francois-Xavier Le Bail
On 13/10/2015 19:07, Jacob Keller wrote: > b) you are rebasing a commit which references another commit in the same > rebase > > I see no valid reason to reference a sha1 in this case. If you're > referencing as a "fixes", then you are being silly since you can just > squash the fix into the

Re: How to rebase when some commit hashes are in some commit messages

2015-10-15 Thread Johannes Schindelin
Hi Francois-Xavier, On Thu, 15 Oct 2015, Francois-Xavier Le Bail wrote: > On 13/10/2015 15:29, Philip Oakley wrote: > > > Thus the only sha1 numbers that could be used are those that are > > within the (possibly implied) instruction sheet (which will list the > > current sha1s that will be

Re: How to rebase when some commit hashes are in some commit messages

2015-10-15 Thread Francois-Xavier Le Bail
On 13/10/2015 15:29, Philip Oakley wrote: > From: "Konstantin Khomoutov" >> On Tue, 13 Oct 2015 10:50:40 +0200 >> Francois-Xavier Le Bail wrote: >> >>> >> For example, if I rebase the following commits, I would want that >>> >> if the commit

Re: How to rebase when some commit hashes are in some commit messages

2015-10-15 Thread Francois-Xavier Le Bail
On 13/10/2015 20:00, Mike Rappazzo wrote: > It seems reasonable that this could be added as a feature of > interactive rebase. The todo list could be automatically adjusted to > "reword" for those commits which are referring to other commits within > the same rebase. As each commit is

Re: How to rebase when some commit hashes are in some commit messages

2015-10-13 Thread Francois-Xavier Le Bail
On 12/10/2015 22:21, Matthieu Moy wrote: > Francois-Xavier Le Bail writes: > >> Hello, >> >> [I try some search engines without success, perhaps I have missed something]. >> >> For example, if I rebase the following commits, I would want that if >> the commit hash

Re: How to rebase when some commit hashes are in some commit messages

2015-10-13 Thread Philip Oakley
From: "Konstantin Khomoutov" On Tue, 13 Oct 2015 10:50:40 +0200 Francois-Xavier Le Bail wrote: >> For example, if I rebase the following commits, I would want that >> if the commit hash 222... become 777..., >> the message >> "Update

Re: How to rebase when some commit hashes are in some commit messages

2015-10-13 Thread Konstantin Khomoutov
On Tue, 13 Oct 2015 10:50:40 +0200 Francois-Xavier Le Bail wrote: > >> For example, if I rebase the following commits, I would want that > >> if the commit hash 222... become 777..., > >> the message > >> "Update test output for

Re: How to rebase when some commit hashes are in some commit messages

2015-10-13 Thread Jacob Keller
On Tue, Oct 13, 2015 at 6:29 AM, Philip Oakley wrote: > My tuppence is that the only sha1's that could/would be rewritten would be > those for the commits within the rebase. During rebasing it is expected that > the user is re-adjusting things for later upstream consumption,

Re: How to rebase when some commit hashes are in some commit messages

2015-10-13 Thread Philip Oakley
From: "Mike Rappazzo" On Tue, Oct 13, 2015 at 1:07 PM, Jacob Keller wrote: On Tue, Oct 13, 2015 at 6:29 AM, Philip Oakley wrote: My tuppence is that the only sha1's that could/would be rewritten would be those for the commits

Re: How to rebase when some commit hashes are in some commit messages

2015-10-13 Thread Mike Rappazzo
On Tue, Oct 13, 2015 at 1:07 PM, Jacob Keller wrote: > On Tue, Oct 13, 2015 at 6:29 AM, Philip Oakley wrote: >> My tuppence is that the only sha1's that could/would be rewritten would be >> those for the commits within the rebase. During rebasing it

Re: How to rebase when some commit hashes are in some commit messages

2015-10-13 Thread Jacob Keller
On Tue, Oct 13, 2015 at 12:24 PM, Philip Oakley wrote: > IIUC (as an alternate example), in G4W one can submit a (long) pull request > with internal back references that would be merged directly, so the sha1's > could be updated as Francois-Xavier originally asked. I have a

Re: How to rebase when some commit hashes are in some commit messages

2015-10-13 Thread Philip Oakley
From: "Jacob Keller" On Tue, Oct 13, 2015 at 12:24 PM, Philip Oakley wrote: IIUC (as an alternate example), in G4W one can submit a (long) pull request with internal back references that would be merged directly, so the sha1's could be updated as

Re: How to rebase when some commit hashes are in some commit messages

2015-10-12 Thread Matthieu Moy
Francois-Xavier Le Bail writes: > Hello, > > [I try some search engines without success, perhaps I have missed something]. > > For example, if I rebase the following commits, I would want that if > the commit hash 222... become 777..., > the message > "Update