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

Raymond ChenMay 15, 2019May 15, 201905/15/19

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

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

Raymond ChenMay 14, 2019May 14, 201905/14/19

Starting with the two-file case.

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

Raymond ChenMay 13, 2019May 13, 201905/13/19

Just take me back.

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

Raymond ChenMay 10, 2019May 10, 201905/10/19

Working completely from trees.

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

Raymond ChenMay 9, 2019May 9, 201905/9/19

Retroactively removing a command line switch.

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

Raymond ChenMay 8, 2019May 8, 201905/8/19

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

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

Raymond ChenMay 7, 2019May 7, 201905/7/19

A variation on a theme.

Stupid git commit-tree tricks, Part 1: Building a commit manually out of a tree

Raymond ChenMay 6, 2019May 6, 201905/6/19

A little bit of plumbing.

Async-Async: Consequences for exceptions

Raymond ChenMay 3, 2019May 3, 201905/3/19

The exception doesn't pop out until later.

Async-Async: Consequences for ordering of multiple calls in flight simultaneously

Raymond ChenMay 2, 2019May 2, 201905/2/19

You don't know when they'll reach the other side.