Re: Equivalent of "fixup" for git filter-branch

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: Equivalent of "fixup" for git filter-branch

From: Andreas Schwab <hidden>
Date: 2016-06-15 22:53:49

Philippe Vaucher [off-list ref] writes:
I was also thinking maybe I could use --parent-filter: when I find a
fixup commit, I set its parent to its parent's parent?
This will keep the attributes of the fixup commit, discarding the
parent's ones.  In git rebase, a fixup keeps the attributes of the
parent, discarding the ones of the fixup.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: Equivalent of "fixup" for git filter-branch

From: Philippe Vaucher <hidden>
Date: 2016-06-15 22:53:49

quoted
I was also thinking maybe I could use --parent-filter: when I find a
fixup commit, I set its parent to its parent's parent?
This will keep the attributes of the fixup commit, discarding the
parent's ones.  In git rebase, a fixup keeps the attributes of the
parent, discarding the ones of the fixup.
Ah right. Thanks for your suggestions, I'll try to get it going. Maybe
the result could be material for more examples in the man page.

Philippe
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help