linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-27 03:05:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

update gitconfig

Browse source 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
This commit is contained in:
Gaetan Semet 2014-10-13 11:40:48 +02:00
commit f56a77a500
1 changed files with 36 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

44
dot_files/gitconfig
View file

@ -1,5 +1,7 @@
# Please copy this part to your ~/.gitconfig # Please copy this part to your ~/.gitconfig
# or include it if git > 0.7.10 # or include it if git > 0.7.10
# [include]
# path = /home/gsemet/.oh-my-zsh/dot_files/gitconfig
[alias] [alias]
commit = commit -s # Always sign commit commit = commit -s # Always sign commit
@ -31,10 +33,6 @@
sync = fetch --all sync = fetch --all
root = rev-parse --show-toplevel root = rev-parse --show-toplevel
# This only works if git > 0.7.10
# # [include]
# # path = /home/username/.oh-my-zsh/dot_files/gitconfig
[color] [color]
ui = auto ui = auto
@ -54,11 +52,41 @@ tool = kdiff3
[guitool "mergetool"] [guitool "mergetool"]
cmd = git mergetool --no-prompt cmd = git mergetool --no-prompt
# [mergetool "kdiff3"] [push]
# cmd = kdiff3 default = current
# args = --L1 base --L2 mine --L3 theirs $base $local $other -o $output
# keepBackup = false
[color]
ui = auto
[core]
editor = vim
# abbrev = 12
[commit]
template = /home/gsemet/.gitmessage
[user]
email = gaetan@xeberon.net
name = Gaetan Semet
[cola]
fontdiff = Courier 10 Pitch,9,-1,5,50,0,0,0,0,0
tabwidth = 4
[guitool "mergetool"]
cmd = git mergetool --no-prompt
[merge]
tool = kdiff3
[mergetool "kdiff3"]
cmd = kdiff3
args = --L1 base --L2 mine --L3 theirs $base $local $other -o $output
keepBackup = false
[push] [push]
default = current default = current
[gui]
newbranchtemplate = gsemet_