tomru/DotfilesOld
1
0
Fork 0
mirror of https://github.com/tomru/DotfilesOld.git synced 2026-03-03 06:27:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup gitconfig

Browse Source
This commit is contained in:
Thomas Ruoff
2018-07-09 11:25:57 +02:00
parent 0416f1fce2
commit 6c8cabbce9
1 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
git/.gitconfig
View File

@@ -1,15 +1,16 @@
[user] [user]
name = Thomas Ruoff name = Thomas Ruoff
email = ThomasRuoff@gmail.com email = ThomasRuoff@gmail.com
[color] [color]
branch = auto branch = auto
diff = auto diff = auto
interactive = auto interactive = auto
status = auto status = auto
[core] [core]
editor=vim -f +1 -c start! editor=vim -f +1 -c start!
autocrlf=input autocrlf=input
eol=lf eol=lf
excludesfile = ~/.gitignore
[alias] [alias]
st = status st = status
co = checkout co = checkout
@@ -22,19 +23,5 @@
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
fix = "!f() { ${EDITOR} $(git diff --name-only | uniq ); }; f" fix = "!f() { ${EDITOR} $(git diff --name-only | uniq ); }; f"
last = "!l() { ${EDITOR} $(git diff-tree --no-commit-id --name-only -r HEAD ); }; l" last = "!l() { ${EDITOR} $(git diff-tree --no-commit-id --name-only -r HEAD ); }; l"
[merge]
tool = bc3
[mergetool]
cmd = /usr/bin/bcompare $LOCAL $REMOTE $BASE $MERGED
[push]
default = current
[giggle]
main-window-maximized = false
main-window-geometry = 1229x863+2049+127
main-window-view = FileView
file-view-vpane-position = 304
file-view-hpane-position = 363
[gui]
historybrowser = gitk
[rebase] [rebase]
autosquash = true autosquash = true