diff options
| author | dakkar <dakkar@thenautilus.net> | 2018-08-03 15:21:56 +0000 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2018-08-03 15:21:56 +0000 |
| commit | 6341faf8234d9cd0de2bc854f4113ff0d591e2d1 (patch) | |
| tree | acb1c1077a777b492043a1d71eeae52097797943 /.gitconfig | |
| parent | different colors for prompt on luxion (diff) | |
| parent | newer redshift config (diff) | |
| download | dotfiles-6341faf8234d9cd0de2bc854f4113ff0d591e2d1.tar.gz dotfiles-6341faf8234d9cd0de2bc854f4113ff0d591e2d1.tar.bz2 dotfiles-6341faf8234d9cd0de2bc854f4113ff0d591e2d1.zip | |
Merge remote-tracking branch 'origin/master' into luxion
Diffstat (limited to '.gitconfig')
| -rw-r--r-- | .gitconfig | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -14,6 +14,8 @@ showbranch = true status = true +[fetch] + prune = true [push] default = tracking [pull] @@ -26,8 +28,14 @@ date = iso [rebase] stat = true + autosquash = true +[transfer] + fsckobjects = true +[grep] + patternType = perl [alias] cmp = diff -b --word-diff=color --word-diff-regex='[[:alnum:]_]+|[^[:space:]]' + cmpshow = show --word-diff=color --word-diff-regex='[[:alnum:]_]+|[^[:space:]]' cmplog = log -u -b --word-diff=color --word-diff-regex='[[:alnum:]_]+|[^[:space:]]' logc = log --oneline --graph refl = log -g --oneline 'HEAD@{now}' --date=relative |