• Skip to primary navigation
  • Skip to main content
Sal Ferrarello
  • About Sal Ferrarello
  • Speaking
  • Connect
    Mastodon GitHub Twitter (deprecated)
You are here: Home / Archives for Git

Git

My Most Valuable Git Aliases are Shell Aliases

Last updated on September 24, 2023 by Sal Ferrarello

While Git supports aliases and I am a big fan of Git aliases, (e.g. ‘git lg’), the most valuable to me (and most used) aliases are shell aliases (e.g. ‘gc’ for ‘git commit’).

Filed Under: Computing, Dev Tips, Recommendations Tagged With: command line, Git, git alias, zsh

Git Rebase and the Multiverse

Last updated on September 17, 2023 by Sal Ferrarello

In “Git Merge and the Multiverse” I looked at merging branches and how sometimes this results in a fast-forward merge and sometimes in the creation of a merge commit. Now let’s look at Git rebase (a.k.a. the power to rewrite history).

Filed Under: Computing, Dev Tips, Programming Tagged With: Git, rebase

Git Merge and the Multiverse

Last updated on September 17, 2023 by Sal Ferrarello

If you’re a fan of science (or science fiction), you may be familiar with the concept of the “Multiverse”, the idea that there are multiple universes. In some science fiction stories, one universe can split, branching into multiple universes and then later collapse into a single universe, this is a surprisingly good analogy for Git and branching.

Filed Under: Computing, Dev Tips, Programming Tagged With: Git

Set Number of Characters in Commit Hash for git log

Last updated on August 15, 2023 by Sal Ferrarello

When I’m writing examples, it is often nice to have very short commit hashes. The ‘–abbrev=3’ argument, passed after the ‘–oneline flag, allows me to reduce the number of characters in the commit to 3.

Filed Under: Computing, Dev Tips Tagged With: Git

Git delete remote branch

Last updated on April 25, 2023 by Sal Ferrarello

This is the command I run when I want to delete a branch named “chore/fix-typo” from the default remote (which is named “origin”): git push origin –delete chore/fix-typo

Filed Under: Dev Tips, Solution Tagged With: Git, git alias

Git Get Current Branch Name

Last updated on March 18, 2023 by Sal Ferrarello

I find there are two different times I want to get the current branch name: 1. When I’m at the command line, 2. Inside a Git alias function I’m writing. Interestingly, I find that my approach in these two situations are different.

Filed Under: Computing, Dev Tips, Solution Tagged With: Git

Git Branch Naming

Last updated on February 26, 2023 by Sal Ferrarello

There are lots of ways to name Git branches. These are my personal rules I’ve developed for naming Git branches.

Filed Under: Computing, Dev Tips, Recommendations Tagged With: Git

Replace Local Git Branch with Remote Version

Last updated on February 20, 2023 by Sal Ferrarello

This situation often arises for me when I’m reviewing a teammate’s Pull Request and they make changes by rewriting history. In this situation, I want to discard my local copy of the Pull Request branch and replace it with the version on GitHub (or wherever the remote branch is being stored).

Filed Under: Computing, Dev Tips, Solution Tagged With: Git

Git autoSetupRemote Prevents “no tracking information” Error

Last updated on November 14, 2022 by Sal Ferrarello

After creating a pushing a new branch to GitHub (or any remote), when I do “git pull” I often get an error that says “There is no tracking information for the current branch”. The Git config value “autoSetupRemote”, introduced in Git version 2.38, lets us avoid this entirely error.

Filed Under: Computing, Dev Tips, Recommendations Tagged With: Git, gitconfig

Compare composer.json on Two Different Git Branches

Last updated on October 25, 2022 by Sal Ferrarello

I have composer.json files on two different branches and I want to compare their (non-dev) dependencies. This is the command I run to compare the “require” section of composer.json on my current branch to the “require” section of composer.json on another branch.

Filed Under: Dev Tips, Solution Tagged With: composer, Git, jq

  • Go to page 1
  • Go to page 2
  • Go to page 3
  • Interim pages omitted …
  • Go to page 7
  • Next Page»

Copyright © 2023 · Bootstrap4 Genesis on Genesis Framework · WordPress · Log in