Articles tagged with git

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 Evolution of Source Code Management: From SVN to AI-Powered Git

   Posted on August 31, 2024 in Programming

   Source Code Management (SCM) has evolved dramatically over the past few decades. What started as simple file versioning systems has transformed into sophisticated platforms integrating AI-driven automation, security, and collaboration features. From the days of CVS and SVN to the dominance of Git and the rise of AI-powered development, this …

3. 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 …

4. Git `remote.origin.prune` vs `fetch.prune`: Which Should You Set?

   Posted on April 09, 2023 in Programming

   Remote-tracking branches are Git's cached view of branches on another server: origin/feature/login, not your local feature/login. When a branch is deleted on GitHub or GitLab, Git does not remove that cached name until a fetch with pruning asks it to. The result is familiar: a branch appears …

5. 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 …

6. Use a Different SSH Identity for One Git Repository

   Posted on February 13, 2023 in Programming

   Multiple GitHub accounts on one laptop are normal now: a managed work identity, a personal account, perhaps an open-source organization account. The failure mode is still surprising. git fetch says the repository does not exist even though it absolutely does, because SSH offered a key that authenticated successfully for the …

7. Here Comes Git

   Posted on July 02, 2022 in uncategorized

   In January of 2016, I joined Facebook and had to make the switch from git to hg. To be honest, I wasn't really some sort of zen master of git, but it didn't take me long to completely forget everything I knew about it.

   Now that I've moved on to …

8. Implementing 'git show' in Mercurial

   Posted on December 10, 2015 in Software

   One of my frequently used git commands is 'git show <rev>'. As in, "show me what the heck this guy did here." Unfortunately, Mercurial doesn't have the same command, but it's easy enough to implement it using an alias in your .hgrc.

   The command you would run from the command …

9. Custom One-Line Log Output for Git and Mercurial

   Posted on November 25, 2015 in Programming

   The default history view in Git and Mercurial is optimized for completeness, not scanning. A compact one-line log is a better daily tool: short ID, subject, relative date, author, and branch or bookmark context. It does not replace a full graph; it makes the first pass fast enough that you …