Articles tagged with source_control

1. Git Rebase vs. Merge: Choose a History Shape Deliberately

   Posted on September 02, 2024 in Programming

   Rebase and merge are not rival moral systems. They create different commit graphs, and the useful choice depends on who already depends on the history. Choose the shape that makes collaboration, debugging, and recovery boring—not the one that wins an argument in a pull request.

   The graph is the …

2. The Mercurial Equivalent of `git show`

   Posted on April 23, 2024 in Programming

   git show <revision> is handy because it combines commit metadata and a patch. Mercurial does not use the same command name, but its composable commands make the equivalent clear: use hg log for the changeset description, hg diff -c for the patch, and hg export when the result needs to …

3. How To Update a Git Remote After a Repository Moves

   Posted on February 16, 2023 in Programming

   A repository move does not require throwing away a useful clone. If the project moves organizations, changes hosts, or is renamed, your local branches, stash, reflog, hooks, and unpushed work can stay right where they are. Update the remote deliberately, verify it, and then decide whether the branch topology also …