[L2Ork-dev] git rebase

[Jonathan Wilkes]

On Tue, Jul 7, 2020 at 3:54 PM Albert Graef <aggraef at gmail.com> wrote:
>
> Or, since I'm feeling a bit lazy today, let me just point you to the corresponding section of the git book: https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History

The problem I have is that rebase -i doesn't play well if you've been
merging with master to keep up to date. It seems like
the branch's commits related to the feature then get interleaved with
whatever got committed in master.

>
> On Tue, Jul 7, 2020 at 9:50 PM Albert Graef <aggraef at gmail.com> wrote:
>>
>> While we're on the topic of `git rebase`, does everyone doing development on Purr Data here know how to use `git rebase -i` to squash commits and in general rearrange history on a branch and/or merge request, so that it looks better and is more comprehensible? That's the second tool in the arsenal that IMHO every contributor should know. If not, then I can probably write a blurb about that, too.
>>
>> Albert
>>
>> --
>> Dr. Albert Gr"af
>> Computer Music Research Group, JGU Mainz, Germany
>> Email: aggraef at gmail.com, web: https://agraef.github.io/
>
>
>
> --
> Dr. Albert Gr"af
> Computer Music Research Group, JGU Mainz, Germany
> Email: aggraef at gmail.com, web: https://agraef.github.io/
> _______________________________________________
> L2Ork-dev mailing list
> L2Ork-dev at disis.music.vt.edu
> https://disis.music.vt.edu/listinfo/l2ork-dev