💾 Git

Separate git configurations for work and play

Put something like this in your ~/.gitconfig:

[includeIf "gitdir:~/work/"]
    path = ~/.gitconfig.work

[includeIf "gitdir:~/code/"]
    path = ~/.gitconfig.personal

If your work repos are in ~/work, you can have a separate user/email etc for repos in that folder.

Delete a tag that's already pushed

git tag -d <tag_name>
git push --delete origin <tag_name>

Signing commited commits

If you want to sign the last N commits that you have already pushed:

git rebase --signoff -S HEAD~N
git push -f

Create an empty commit

git commit --allow-empty -m "blah blah"

Useful if you have a gitops workflow and just want to raise a PR to trigger something from there.

Show parents of a merge commit

git cat-file -p <commit>

or

git show --pretty=raw <commit>

Both these show similar information: the committer, the parent(s), commit text and so on.

Show files changed between two commit IDs

Now that you have the two parents of a merged request (see above tip), you can see all files changed between its two parents with a command like this:

git diff --name-only <sha1> <sha2>

Color coded git output

git config --global color.ui true

Git objects

  • Tree
  • Blob
  • Commit
  • Tag

Reverting a reverted commit in git

If you've reverted a recent commit with:

git reset HEAD^

You can undo the revert with this:

git reset HEAD@{1}

Using git stash to save changes temporarily

  • First do a git add (if its a new file to be tracked), then git stash
  • Check with git stash list
  • Reapply with git stash apply
  • Otherwise use git stash pop to recover the files and discard the stash
  • Creating a branch from a stash:
git stash branch testchanges

View commits that aren't in master

  • To see commits that have not yet merged to master:
git log --no-merges master..

Bitbucket: checkout a pull request

First add this to .git/config under the origin section:

    fetch = +refs/pull-requests/*:refs/remotes/origin/pull-requests/*

Then fetch the pull requests:

git fetch origin

Then checkout the one you want:

git checkout pull-requests/1000/from

Git rebase vs normal pull

  • Instead of a normal pull, try this:

git pull --rebase origin master

  • And make it permanent with this: git config --global pull.rebase true
  • 'The --rebase option tells Git to move all of Mary's commits to the tip of the master branch after synchronising it with the changes from the central repository.'
  • From here: https://www.atlassian.com/git/tutorials/comparing-workflows/centralized-workflow
  • This removes the superfluous 'merge commit' that comes up normally.
  • After fixing a merge conflict:
git add <some-file>
git rebase --continue
  • To abort:
git rebase --abort
  • Finally:
git push origin master

Git log on a file

git log -p filename

actually do this:

git log --follow filename

Submodules

  • To update all submodules:
git submodule update --init --recursive
  • To fetch the latest code from a submodule:
    cd <submodule-folder>
    git pull
    cd ..
    git commit -am "bumping up submodule version"

Then merge the code. The next time the parent repository is pulled, updating the submodule will get the latest commit in it.

Working with remotes

  • Changing a remote's name
git remote origin set-url http://some-other-url
  • Adding a remote
git remote add newremote http://newremote-url
  • Then as usual push/pull to and from these remotes
git pull origin master

git push newremote master

Leaderboards

git shortlog -sn

Hide Whitespace Noise

Good when some one changes indentations and a whole lot of rubbish comes).

git diff -w

Show words that have changed inline

git diff --word-diff

See what everyone is up to

git log --all --oneline --no-merges

Generate a changelog

git log --oneline --no-merges <last tag>..HEAD

View complex logs

git log --graph --all --decorate --stat --date=iso

Handy aliases

Put something like this in your .gitconfig

[alias]
    st = status --branch --short
    wat = log --graph --decorate --oneline -15
    follow = log --follow -p