diff options
| author | Anton Bobov <abobov@gmail.com> | 2018-11-01 22:19:17 +0500 |
|---|---|---|
| committer | Anton Bobov <abobov@gmail.com> | 2018-11-01 22:19:17 +0500 |
| commit | 39138280abbf8afdb68ef292ef0858d2e3385606 (patch) | |
| tree | 7d03c6ad3ac0ef84716abb94a7ef8e18f06e3001 /files/.gitconfig | |
| parent | 07821c5689845387bb94aee64618e19c1e515859 (diff) | |
Update config
Diffstat (limited to 'files/.gitconfig')
| -rw-r--r-- | files/.gitconfig | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/files/.gitconfig b/files/.gitconfig index b063960..5481ae4 100644 --- a/files/.gitconfig +++ b/files/.gitconfig @@ -22,7 +22,7 @@ [alias] aa = add --all --intent-to-add ar = !sh -c 'git archive --format=tar --prefix="$(basename "$PWD")-$1/" $1^{tree} | bzip2 >"$(basename "$PWD")-$1.tar.bz2"' - - br = branch + br = branch --sort=-committerdate c = commit --verbose co = checkout ci = commit @@ -61,3 +61,13 @@ ;clean = unexpand --tabs=4 --first-only [gui] tabsize = 2 +[pull] + rebase = true +[guitool "meld"] + cmd = meld $FILENAME + noconsole = yes + needsfile = yes +[guitool "gvim"] + cmd = gvim $FILENAME + noconsole = yes + needsfile = yes |