Created
May 26, 2016 08:38
-
-
Save andy-b-84/ac925cade2cc8c8c5bbe844ff6a3da62 to your computer and use it in GitHub Desktop.
Usual .gitconfig file, with git-flow aliases, notably some which I use to make the history a bit more readable after a "git flow feature finish" or a "git flow hotfix finish" (I hate the way git-flow merge everything back into develop, makes everything impossible to read afterwards)
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
[core] | |
excludesfile = /Users/andy_b_84/.gitignore_global | |
[difftool "sourcetree"] | |
cmd = opendiff \"$LOCAL\" \"$REMOTE\" | |
path = | |
[mergetool "sourcetree"] | |
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" | |
trustExitCode = true | |
[user] | |
name = Patrick Laxton | |
;email = <email> | |
[alias] | |
co = checkout | |
ci = commit | |
st = status | |
br = branch | |
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short | |
type = cat-file -t | |
dump = cat-file -p | |
fi = flow init | |
ff = flow feature | |
ffs = flow feature start | |
ffp = flow feature publish | |
ffr = flow feature rebase | |
fff = flow feature finish | |
frs = flow release start | |
frp = flow release publish | |
frf = "!git flow release finish -m \"release/$1\" $1; git checkout master; git branch -f develop; echo branch develop forced to branch master" | |
fhs = flow hotfix start | |
fhf = "!git flow hotfix finish -m \"hotfix/$1\" $1; git checkout develop; echo now rebasing develop onto master; git rebase master" | |
[http] | |
postBuffer = 524288000 | |
[core] | |
autocrlf = input | |
ignorecase = false | |
[push] | |
default = simple |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment