|
|
@@ -1,35 +1,45 @@
|
|
|
[user]
|
|
|
- name = Emmanuel Bouthenot
|
|
|
- email = kolter@openics.org
|
|
|
- signingkey = 929D42C3
|
|
|
+ name = Emmanuel Bouthenot
|
|
|
+ email = kolter@openics.org
|
|
|
+ signingkey = 929D42C3
|
|
|
|
|
|
[alias]
|
|
|
- br = branch
|
|
|
- st = status
|
|
|
- l = log --graph --decorate --pretty=format:\"%h %C(magenta)%ci%Creset%C(yellow)%d %Creset%s %C(cyan)%cn <%cE>\"
|
|
|
- spull = submodule foreach 'git pull'
|
|
|
+ br = branch
|
|
|
+ st = status
|
|
|
+ s = status --untracked-files=no
|
|
|
+ sa = status --untracked-files=all
|
|
|
+ d = diff
|
|
|
+ dh = diff HEAD
|
|
|
+ dc = diff --cached
|
|
|
+ ci = commit
|
|
|
+ co = checkout
|
|
|
+ l = ! export LESS=-R GIT_PAGER=less && git log --graph --decorate --pretty=format:\"%h %C(magenta)%ci%Creset%C(yellow)%d %Creset%s %C(cyan)%cn <%cE>\"
|
|
|
+ ls = ls-files
|
|
|
+ ign = ls-files -o -i --exclude-standard
|
|
|
+ unstage = reset HEAD
|
|
|
+ spull = submodule foreach 'git pull'
|
|
|
|
|
|
[color]
|
|
|
- ui = auto
|
|
|
- pager = true
|
|
|
+ ui = auto
|
|
|
+ pager = false
|
|
|
|
|
|
[color "diff"]
|
|
|
- meta = green
|
|
|
- frag = yellow
|
|
|
- old = magenta
|
|
|
- new = cyan
|
|
|
+ meta = green
|
|
|
+ frag = yellow
|
|
|
+ old = magenta
|
|
|
+ new = cyan
|
|
|
|
|
|
[color "status"]
|
|
|
- header = bold blue
|
|
|
- added = green
|
|
|
- changed = bold red
|
|
|
- untracked = bold yellow
|
|
|
+ header = bold blue
|
|
|
+ added = green
|
|
|
+ changed = bold red
|
|
|
+ untracked = white
|
|
|
|
|
|
[merge]
|
|
|
- tool = vimdiff
|
|
|
+ tool = vimdiff
|
|
|
|
|
|
# git.debian.org specifics
|
|
|
[url "git://anonscm.debian.org"]
|
|
|
- insteadOf = "git://git.debian.org"
|
|
|
+ insteadOf = "git://git.debian.org"
|
|
|
[url "ssh://git.debian.org"]
|
|
|
- pushInsteadOf = "git://git.debian.org"
|
|
|
+ pushInsteadOf = "git://git.debian.org"
|
