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

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

Check If We Can Do a Git Fast-Forward Merge

Last updated on August 31, 2022 by Sal Ferrarello

When I’m working with Git, there are times I want to check if I can do a fast-forward merge but I do NOT want to actually perform the merge.

Warning! This is a draft, not a finalized post. See full draft disclosure.

Filed Under: Dev Tips, Draft, Solution Tagged With: fast-forward, Git

Revert Merge Commit

Last updated on May 9, 2022 by Sal Ferrarello

Typically a Git commit has exactly one parent, however a Git merge commit has two parents. The problem this creates with Git revert, is it is unclear which commit we want to revert to.

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

Always Bring Your Pull Requests Up to Date

Last updated on April 26, 2022 by Sal Ferrarello

A Pull Request (PR) should always be up to date with the branch into which it is being merged. Another way of saying this is you should be able to merge your PR as a fast-forward merge (even if you decide not to do a fast-forward merge). In this post we’ll look at how a safe looking PR that is out of date can be catastrophic to merge.

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

Intermediate Git

Last updated on March 27, 2022 by Sal Ferrarello

I’ve been using Git for a number of years. When I was a Git beginner, I followed some prescribed steps and things worked – most of the time. This seems to be a pretty common experience for people starting out with Git. The magical part is when I started to understand Git, when I went from beginner to intermediate. These are some blog posts and videos that would have helped me with that transition.

Filed Under: Dev Tips, Recommendations Tagged With: Git

git reset –hard vs git checkout -f

Last updated on February 8, 2022 by Sal Ferrarello

I recently had a conversation about “git reset –hard” vs “git checkout -f”, and it turns out they do the same thing. This is one of the tricky things about Git, there are often multiple ways to do the same thing.

Filed Under: Computing, Dev Tips Tagged With: Git

git alias tab completion for functions

Last updated on February 6, 2022 by Sal Ferrarello

When creating a Git alias that points to a function, sometimes Git provides the wrong tab completion by default (e.g. filename completion instead of branch name completion). This is how we can tell Git, which type of completion to use.

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

git reset vs revert

Last updated on November 15, 2021 by Sal Ferrarello

Conceptually, “git reset” is erasing your last change while “git revert” is adding a new change that undoes your previous change.

Warning! This is a draft, not a finalized post. See full draft disclosure.

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

Remove newline at end of text file

Last updated on February 10, 2022 by Sal Ferrarello

Sometimes when I’m working with files in Git, I find myself with a change in a file that says “No newline at end of file”. This occurs when my editor adds the missing newline at the end of the file. While you should have a newline at the end of the file, you may have a reason for not wanting to add this change. In that case, you can remove the newline from the end of the file.

Warning! This is a draft, not a finalized post. See full draft disclosure.

Filed Under: Computing, Dev Tips, Draft, Solution Tagged With: command line, Git

  • 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