mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-04-17 04:29:14 +02:00
rework gitconfig
This commit is contained in:
parent
6000880f2d
commit
a4967d8ab9
1 changed files with 30 additions and 12 deletions
|
|
@ -15,6 +15,10 @@
|
||||||
loo = log --pretty=oneline --abbrev-commit
|
loo = log --pretty=oneline --abbrev-commit
|
||||||
lol = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
|
lol = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
|
||||||
lola = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all
|
lola = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all
|
||||||
|
loa = log --graph --abbrev-commit --all
|
||||||
|
llc = log --decorate --pretty=oneline --abbrev-commit -1
|
||||||
|
lc = show HEAD
|
||||||
|
id = rev-parse HEAD
|
||||||
|
|
||||||
rewrite-history = rebase -i HEAD~2
|
rewrite-history = rebase -i HEAD~2
|
||||||
rewrite-history1 = rebase -i HEAD~
|
rewrite-history1 = rebase -i HEAD~
|
||||||
|
|
@ -33,35 +37,49 @@
|
||||||
sync = fetch --all
|
sync = fetch --all
|
||||||
root = rev-parse --show-toplevel
|
root = rev-parse --show-toplevel
|
||||||
|
|
||||||
[color]
|
|
||||||
ui = auto
|
|
||||||
|
|
||||||
[core]
|
[core]
|
||||||
editor = vim
|
editor = vim
|
||||||
|
|
||||||
[cola]
|
[cola]
|
||||||
fontdiff = Courier 10 Pitch,9,-1,5,50,0,0,0,0,0
|
fontdiff = Courier 10 Pitch,9,-1,5,50,0,0,0,0,0
|
||||||
tabwidth = 4
|
tabwidth = 4
|
||||||
|
|
||||||
[commit]
|
[commit]
|
||||||
template = /home/username/.gitmessage
|
template = /home/username/.gitmessage
|
||||||
|
|
||||||
[merge]
|
[merge]
|
||||||
tool = kdiff3
|
tool = kdiff3
|
||||||
|
|
||||||
[guitool "mergetool"]
|
[guitool "mergetool"]
|
||||||
cmd = git mergetool --no-prompt
|
cmd = git mergetool --no-prompt
|
||||||
|
|
||||||
[push]
|
[push]
|
||||||
default = current
|
default = current
|
||||||
|
|
||||||
|
|
||||||
[color]
|
[color]
|
||||||
ui = auto
|
ui = auto
|
||||||
|
lc = show HEAD
|
||||||
|
id = rev-parse HEAD
|
||||||
|
lc = show HEAD
|
||||||
|
id = rev-parse HEAD
|
||||||
|
|
||||||
[core]
|
[color "branch"]
|
||||||
editor = vim
|
current = yellow reverse
|
||||||
# abbrev = 12
|
local = yellow
|
||||||
|
remote = green
|
||||||
|
|
||||||
|
[color "diff"]
|
||||||
|
meta = yellow bold
|
||||||
|
frag = magenta bold
|
||||||
|
old = red bold
|
||||||
|
new = green bold
|
||||||
|
whitespace = red reverse
|
||||||
|
|
||||||
|
[color "status"]
|
||||||
|
added = yellow
|
||||||
|
changed = green
|
||||||
|
untracked = cyan
|
||||||
|
|
||||||
[user]
|
[user]
|
||||||
email = gaetan@xeberon.net
|
email = gaetan@xeberon.net
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue