Skip to content

Instantly share code, notes, and snippets.

@GRArmstrong
Last active October 23, 2019 13:35
Show Gist options
  • Save GRArmstrong/8826410 to your computer and use it in GitHub Desktop.
Save GRArmstrong/8826410 to your computer and use it in GitHub Desktop.
Git configuration, with so many aliases!
[user]
name = Graham R. Armstrong
email = ### EMAIL ADDRESS HERE OBVS ###
[core]
autocrlf = input
editor = atom -w
[push]
default = simple
[color]
diff = auto
status = auto
branch = auto
grep = auto
ui = auto
[alias]
st = status
ci = commit
co = checkout
cb = checkout -b
df = diff
g = grep -n
cia = commit --amend
br = branch
sb = show-branch
cp = cherry-pick
staged = diff --cached
rb = rebase
rbi = rebase --interactive
rbc = rebase --continue
rbs = rebase --skip
rl = reflog
rs = remote show
rt = remote
ru = remote update
rp = remote prune
sm = submodule
sld = stash list --date=local
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
lga = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --all
fixup = !sh -c 'git commit -m \"fixup! $(git log -1 --format='\\''%s'\\'' $@)\"' -
squash = !sh -c 'git commit -m \"squash! $(git log -1 --format='\\''%s'\\'' $@)\"' -
ri = rebase --interactive --autosquash
mf = merge --ff-only
[merge]
tool = meld
[mergetool "meld"]
cmd = meld --auto-merge \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output \"$MERGED\" --label \"MERGE (REMOTE BASE MY)\"
trustExitCode = false
[mergetool]
prompt = false
keepBackup = false
[diff]
guitool = meld
[difftool "meld"]
cmd = meld \"$LOCAL\" \"$REMOTE\" --label \"DIFF (ORIGINAL MY)\"
[http]
emptyAuth = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment