Re: squash commits deep down in history

2014-11-04 Thread Phil Hord
On Thu, Oct 23, 2014 at 8:34 AM, Henning Moll wrote: > Hi, > > i need to squash several commits into a single one in a automated way. I know > that there is interactive rebase, which can also be automated using > GIT_SEQUENCE_EDITOR. Unfortunately my history is very large and i need to > squash

Re: squash commits deep down in history

2014-10-24 Thread Jakub Narębski
W dniu 2014-10-23 22:08, Johannes Sixt pisze: Am 23.10.2014 um 14:34 schrieb Henning Moll: i need to squash several commits into a single one in a automated way. I know that there is interactive rebase, which can also be automated using GIT_SEQUENCE_EDITOR. Unfortunately my history is very lar

Re: squash commits deep down in history

2014-10-23 Thread Henning Moll
Am 23.10.2014 um 22:08 schrieb Johannes Sixt: Use git-replace do construct a squashed commit that replaces the last child in each run such that its parent points to the parent of the first in the run. Then use a git-filterbranch without filters to burn the parenthood into the history. -- Hannes

Re: squash commits deep down in history

2014-10-23 Thread Johannes Sixt
Am 23.10.2014 um 14:34 schrieb Henning Moll: > i need to squash several commits into a single one in a automated > way. I know that there is interactive rebase, which can also be > automated using GIT_SEQUENCE_EDITOR. Unfortunately my history is very > large and i need to squash deep down in the hi

squash commits deep down in history

2014-10-23 Thread Henning Moll
Hi, i need to squash several commits into a single one in a automated way. I know that there is interactive rebase, which can also be automated using GIT_SEQUENCE_EDITOR. Unfortunately my history is very large and i need to squash deep down in the history several times. So using interactive reb