Skip to content

Instantly share code, notes, and snippets.

@schleumer
Last active March 29, 2017 02:55
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save schleumer/02bc4e3edc5b16d1409e22080c445252 to your computer and use it in GitHub Desktop.
Save schleumer/02bc4e3edc5b16d1409e22080c445252 to your computer and use it in GitHub Desktop.
[user]
email = wesley.schleumer@gmail.com
name = Wesley Schleumer
[svn]
rmdir = true
[core]
compression = 0
excludesfile = ~/.gitignore
packedGitLimit = 2047m
packedGitWindowSize = 2047m
[pack]
deltaCacheSize = 2047m
packSizeLimit = 2047m
windowMemory = 2047m
[http]
postBuffer = 524288000
[ssh]
postBuffer = 524288000
[alias]
branch-name = "!git rev-parse --abbrev-ref HEAD"
st = status
pub = "!git push -u origin $(git branch-name)"
sub = "!git pull origin $(git branch-name)"
lu = ls-files -o --exclude-standard
# Checkout our version of a file and add it
ours = "!f() { git checkout --ours $@ && git add $@; }; f"
# Checkout their version of a file and add it
theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
c = "!f() { echo adding all files; git add -A; echo commiting $(git rev-parse --abbrev-ref HEAD); git commit -a -m $(git rev-parse --abbrev-ref HEAD); }; f"
[merge]
tool = meld
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment