Skip to content

Instantly share code, notes, and snippets.

@cake17
Forked from tdd/gitconfig.ini
Last active January 20, 2016 12:22
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 cake17/6624482 to your computer and use it in GitHub Desktop.
Save cake17/6624482 to your computer and use it in GitHub Desktop.
# Put this in your ~/.gitconfig or ~/.config/git/config
# Windows users: "~" is your profile's home directory, e.g. C:\Users\<YourName>
[user]
name = Ton Nom
email = ton@email.tld
[color]
# Enable colors in color-supporting terminals
ui = auto
[alias]
st = status
ci = commit
lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ar)%Creset'
last = log -1 HEAD
unstage = reset HEAD --
br = branch -v
rem = remote -v
co = checkout
pom = push origin master
pulom = pull origin master
[core]
# print everything, not just the height of the screen
pager = cat
# If you want to use Atom's wrapper:
# editor = atom --wait
whitespace = -trailing-space
[diff]
# to prefix with good letters c=commit i=index w=working directory and not just a & b
mnemonicPrefix = true
# Show renames/moves as such
renames = true
# When using --word-diff, assume --word-diff-regex=.
wordRegex = .
[fetch]
# detect changes on fetch/pull and ask what to do
recurseSubmodules = on-demand
[grep]
# Consider most regexes to be ERE
extendedRegexp = true
[log]
# Use abbrev SHAs whenever possible/relevant instead of full 40 chars
abbrevCommit = true
[merge]
# affiche non seulement les versions locale et distante
# (ou récipiendaire et source, si vous préférez),
# mais aussi la version de l'ancêtre commun.
conflictStyle = diff3
[mergetool]
keepBackup = false
keepTemporaries = false
prompt = false
[pull]
# This is GREAT… when you know what you're doing and are careful
# not to pull --no-rebase over a local line containing a true merge.
# rebase = true
# WARNING! This option, which does away with the one gotcha of
# auto-rebasing on pulls, is only available from 1.8.5 onwards.
rebase = preserve
[push]
# Default push should only push the current branch to its push target, regardless of its remote name
default = upstream
# When pushing, also push tags whose commit-ishs are now reachable upstream
followTags = true
[rerere]
# If, like me, you like rerere, decomment these
# autoupdate = true
# enabled = true
[status]
# Display submodule rev change summaries in status
submoduleSummary = true
# Recursively traverse untracked directories to display all contents
showUntrackedFiles = all
[tag]
# Sort tags as version numbers whenever applicable, so 1.10.2 is AFTER 1.2.0.
sort = version:refname
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment