Last active
October 20, 2016 12:15
-
-
Save julienbourdeau/be21f43006244234675e to your computer and use it in GitHub Desktop.
Git configuration for contributing to PrestaShop
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[user] | |
name = Your Name | |
email = your-github-email@tiscali.fr | |
[color] | |
ui = auto | |
[alias] | |
st = status | |
stt = status --ignore-submodules | |
ci = commit | |
br = branch -avv | |
lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ar)%Creset' | |
oops = commit --amend --no-edit | |
[apply] | |
# Detect whitespace errors when applying a patch | |
whitespace = fix | |
[core] | |
pager = cat | |
# Treat spaces before tabs and all kinds of trailing whitespace as an error | |
# [default] trailing-space: looks for spaces at the end of a line | |
# [default] space-before-tab: looks for spaces before tabs at the beginning of a line | |
whitespace = space-before-tab,-indent-with-non-tab,trailing-space | |
# Make `git rebase` safer on OS X | |
# More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/> | |
trustctime = false | |
# If you want to use Sublime Text 2's subl wrapper: | |
# editor = subl -w | |
# Do not track file permissions | |
fileMode = false | |
[diff] | |
mnemonicPrefix = true | |
renames = true | |
wordRegex = . | |
submodule = log | |
[fetch] | |
recurseSubmodules = on-demand | |
[grep] | |
extendedRegexp = true | |
[log] | |
abbrevCommit = true | |
[merge] | |
conflictStyle = diff3 | |
[pull] | |
# 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 = upstream | |
[status] | |
submoduleSummary = true | |
showUntrackedFiles = all | |
[tag] | |
sort = version:refname |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment