Kris Hicks


  • Rewinding git pull

    Rewinding git pull

    If you're using a rebase strategy for the first time you may run git pull in a situation where Git practically tells you to do it, but you don't actually want to do it. The situation is described...

    Read More
  • quick tips

    quick tips

    The following are things I found very helpful, which you also may find make your day-to-day usage of Git more enjoyable. Go HEADless In many (and perhaps all) cases HEAD is implied when no ref...

    Read More
  • rewinding git commit –amend

    rewinding git commit –amend

    It may come to pass that you will amend HEAD with changes that were meant to go on a commit earlier than HEAD via git commit --amend. In this case, you'll want to rewind that operation you just...

    Read More
  • git config rerere.enabled true

    git config rerere.enabled true

    There have been times where I performed a rebase and had to resolve conflicts as part of the rebase, and then decided to abort the rebase for one reason or another. Without rerere the next time I...

    Read More
  • exec


    (Update #1 below) Say you're going to do an interactive rebase where you're going to be squashing commits or reordering them. During this process you may want Git to execute a command after...

    Read More
  • git rebase –onto

    git rebase –onto

    "Hold on to your butts.." --Samuel L. Jackson as Ray Arnold in 'Jurassic Park' Part One: The two-argument form of git rebase --onto Say there's a commit C made on master that made a...

    Read More
  • git add -e

    git add -e

    git add -e is like git add -p, except instead of adding things at the hunk level, you edit the entire patch at once. Or, in other words, whereas git add -p will show you each hunk for every file...

    Read More
  • git reset -p

    git reset -p

    I've been using git reset -p a lot recently and I think it makes sense to clarify what it is that it does because when I first started using it I found it a little confusing. I sometimes realize...

    Read More
  • loading
    Loading More...