2013-05-02 23:38:00 +02:00
|
|
|
################################################################################
|
|
|
|
|
# .gitconfig -- my personal GIT configuration
|
2013-09-16 15:13:17 +02:00
|
|
|
# see https://github.com/hcartiaux/dotfiles
|
2013-05-02 23:38:00 +02:00
|
|
|
#
|
|
|
|
|
# Copyright (c) 2010 Sebastien Varrette <Sebastien.Varrette@uni.lu>
|
|
|
|
|
#
|
|
|
|
|
# Copyright (c) 2011 Hyacinthe Cartiaux <hyacinthe.cartiaux@uni.lu>
|
|
|
|
|
# _ _ __ _
|
|
|
|
|
# __ _(_) |_ ___ ___ _ __ / _(_) __ _
|
|
|
|
|
# / _` | | __/ __/ _ \| '_ \| |_| |/ _` |
|
|
|
|
|
# | (_| | | || (_| (_) | | | | _| | (_| |
|
|
|
|
|
# (_)__, |_|\__\___\___/|_| |_|_| |_|\__, |
|
|
|
|
|
# |___/ |___/
|
|
|
|
|
#
|
|
|
|
|
################################################################################
|
|
|
|
|
# Resources:
|
|
|
|
|
# - http://stackoverflow.com/questions/267761/what-does-your-gitconfig-contain
|
2013-09-16 15:13:17 +02:00
|
|
|
# - https://github.com/Falkor/dotfiles
|
2013-05-02 23:38:00 +02:00
|
|
|
[user]
|
|
|
|
|
name = Hyacinthe Cartiaux
|
|
|
|
|
email = hyacinthe.cartiaux@uni.lu
|
|
|
|
|
signingkey = 0x550DF40B
|
|
|
|
|
|
|
|
|
|
[alias]
|
|
|
|
|
up = pull origin
|
|
|
|
|
pu = push origin
|
|
|
|
|
st = status
|
|
|
|
|
df = diff
|
|
|
|
|
# ci = commit -S
|
|
|
|
|
ci = commit
|
|
|
|
|
br = branch
|
|
|
|
|
w = whatchanged --abbrev-commit
|
|
|
|
|
ls = ls-files
|
|
|
|
|
gr = log --graph --oneline --decorate
|
2016-03-11 15:19:08 +01:00
|
|
|
lol = log --graph --pretty=format:'%C(yellow)%h%Creset%C(cyan)%C(bold)%d%Creset %C(cyan)(%cd)%Creset %C(green)%cn%Creset %s' --date=format:'%Y-%m-%d %H:%M:%S'
|
2013-07-19 15:04:48 +02:00
|
|
|
unstage = reset HEAD --
|
|
|
|
|
last = log -1 HEAD
|
|
|
|
|
amend = commit --amend
|
|
|
|
|
undo-commit = reset --soft HEAD^
|
2013-05-02 23:38:00 +02:00
|
|
|
# From http://j.shirley.im/tech/git-flow/
|
2013-07-19 15:04:48 +02:00
|
|
|
feature-start = !git flow feature start $1
|
2013-05-02 23:38:00 +02:00
|
|
|
feature-finish = !git flow feature finish $1 && git push
|
|
|
|
|
# fs, feature start
|
|
|
|
|
fs = !git flow feature start $1 && grb publish feature/$1
|
|
|
|
|
# ff, feature finish. Always push to the final branch (remote)
|
|
|
|
|
# if it was successful
|
|
|
|
|
ff = !git flow feature finish $1 && git push
|
|
|
|
|
|
|
|
|
|
[color]
|
|
|
|
|
ui = true
|
|
|
|
|
diff = auto
|
|
|
|
|
status = auto
|
|
|
|
|
branch = auto
|
|
|
|
|
|
|
|
|
|
[color "branch"]
|
|
|
|
|
current = yellow reverse
|
|
|
|
|
local = green
|
|
|
|
|
remote = red
|
|
|
|
|
|
|
|
|
|
[color "diff"]
|
|
|
|
|
meta = yellow bold
|
|
|
|
|
|
|
|
|
|
[color "status"]
|
2014-03-15 16:50:09 +01:00
|
|
|
added = magenta bold
|
|
|
|
|
changed = green
|
2013-05-02 23:38:00 +02:00
|
|
|
untracked = red
|
|
|
|
|
|
|
|
|
|
[core]
|
2016-03-10 18:46:32 +01:00
|
|
|
autocrlf = false
|
2016-10-12 12:03:33 +02:00
|
|
|
pager = less -FiRSwX
|
2016-03-10 18:46:32 +01:00
|
|
|
editor = vim
|
|
|
|
|
mergeoptions = --no-edit
|
2013-05-02 23:38:00 +02:00
|
|
|
|
|
|
|
|
[merge]
|
|
|
|
|
tool = vimdiff
|
2016-01-06 15:01:42 +01:00
|
|
|
conflictstyle = diff3
|
|
|
|
|
|
|
|
|
|
[mergetool]
|
|
|
|
|
prompt = false
|
2013-05-02 23:38:00 +02:00
|
|
|
|
|
|
|
|
[http]
|
|
|
|
|
sslverify = false
|
2013-05-03 02:32:18 +02:00
|
|
|
|
|
|
|
|
[push]
|
2013-05-03 02:41:04 +02:00
|
|
|
default = matching
|
2013-10-31 10:38:03 +01:00
|
|
|
|
2016-08-23 17:04:47 +02:00
|
|
|
[filter "lfs"]
|
|
|
|
|
clean = git-lfs clean -- %f
|
|
|
|
|
smudge = git-lfs smudge -- %f
|
|
|
|
|
required = true
|
