Henning Moll writes:
> Just a final question: Is it possible to keep the GIT_COMMITTER_DATE in
> all those rebases?
If you want that you need to work with git filter-branch.
Andreas.
--
Andreas Schwab, sch...@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4
Am 26.10.2014 um 20:02 schrieb Christian Couder:
Yeah. Henning, when interactively rebasing, in our editor, you should
have something like: pick A pick P pick B pick Q pick C pick D pick R
pick E which should work without any conflict. And then you can rebase
the b1 and b2 branches on the resul
On Sun, Oct 26, 2014 at 4:19 PM, Andreas Schwab wrote:
> Henning Moll writes:
>
>> 1. For P, A is the nearest prior commit on 'master'
>> 2. on master: git rebase -i A^
>> 3. change A from pick to edit. save. quit
>> 4. git merge P
>> 5. git rebase --continue
>>
>> From the perspective of 'master
Henning Moll writes:
> 1. For P, A is the nearest prior commit on 'master'
> 2. on master: git rebase -i A^
> 3. change A from pick to edit. save. quit
> 4. git merge P
> 5. git rebase --continue
>
> From the perspective of 'master' this worked. But as all of the commits
> have been rewritten, th
Am 26.10.2014 um 06:46 schrieb Christian Couder:
Hi,Could you tell us why interactive rebase did not work?
First of all i have to admit that i did not i-rebase-merge, but
i-rebase-cherrypick. Now i tried it with i-rebase-merge and it didn't
work either.
Here's my workflow, which i repeated fo
Hi,
On Sat, Oct 25, 2014 at 2:31 PM, Henning Moll wrote:
> Hi,
>
> suppose the following history
>
> P - - - Q - - - - - R <-extern
>
> A -- - B - - - C - D - - - E <-master
> \ \
> M ... \ <-b1
> \
>
Hi,
suppose the following history
P - - - Q - - - - - R <-extern
A -- - B - - - C - D - - - E <-master
\ \
M ... \ <-b1
\
W ... <-b2
Note that master and extern do not have a common parent.
7 matches
Mail list logo
