The Old New Thing

Mundane git commit-tree tricks, Part 7: Combining more than two files into one while preserving line history, manual octopus merging

May 15, 2019 May 15, 2019 05/15/19

Raymond Chen

Sometimes you just have to take things into your own hands.

Mundane git tricks: Combining two files into one while preserving line history

May 14, 2019 May 14, 2019 05/14/19

Raymond Chen

Starting with the two-file case.

Mundane git commit-tree tricks, Part 6: Resetting by reusing an earlier tree

May 13, 2019 May 13, 2019 05/13/19

Raymond Chen

Just take me back.

Mundane git commit-tree tricks, Part 5: Squashing without git rebase

May 10, 2019 May 10, 2019 05/10/19

Raymond Chen

Working completely from trees.

Mundane git commit-tree tricks, Part 4: Changing a squash to a merge

May 9, 2019 May 9, 2019 05/9/19

Raymond Chen

Retroactively removing a command line switch.

Mundane git commit-tree tricks, Part 3: Building a throwaway commit in order to perform a combined cherry-pick-squash

May 8, 2019 May 8, 2019 05/8/19

Raymond Chen

You can create a commit just so you can pick it.

Mundane git commit-tree tricks, Part 2: Building a merge commit manually out of a tree

May 7, 2019 May 7, 2019 05/7/19

Raymond Chen

A variation on a theme.