diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-27 16:38:47 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-27 16:38:47 -0500 |
commit | a02c5c1758a18afdebe66f62665db44bb349474d (patch) | |
tree | 909e062e3899ac0aab50907da5885fe83a1f229a | |
parent | 43f3fd77c8daf23acf86f0fff7ef95f00ec52225 (diff) |
undo putting .git* in .config/git; git doesn't play well with it
-rw-r--r-- | .config/git/config | 14 | ||||
-rw-r--r-- | .config/git/gitk | 36 | ||||
-rw-r--r-- | .config/git/ignore | 0 | ||||
-rw-r--r--[l---------] | .gitconfig | 15 | ||||
-rw-r--r--[l---------] | .gitignore | 1 | ||||
-rw-r--r--[l---------] | .gitk | 37 |
6 files changed, 50 insertions, 53 deletions
diff --git a/.config/git/config b/.config/git/config deleted file mode 100644 index 218b006..0000000 --- a/.config/git/config +++ /dev/null @@ -1,14 +0,0 @@ -[user] - name = Luke Shumaker - email = LukeShu@sbcglobal.net -[color] - ui = auto -[sendemail] - smtpencryption = ssl - smtpserver = plus.smtp.mail.yahoo.com - smtpuser = lukeshu@sbcglobal.net - smtpserverport = 465 -[push] - default = matching -[alias] - lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative diff --git a/.config/git/gitk b/.config/git/gitk deleted file mode 100644 index c0a0171..0000000 --- a/.config/git/gitk +++ /dev/null @@ -1,36 +0,0 @@ -set mainfont {Helvetica 9} -set textfont {{DejaVu Sans Mono} 9} -set uifont {Helvetica 9 bold} -set tabstop 8 -set findmergefiles 0 -set maxgraphpct 50 -set maxwidth 16 -set cmitmode patch -set wrapcomment none -set autoselect 1 -set autosellen 40 -set showneartags 1 -set hideremotes 0 -set showlocalchanges 1 -set datetimeformat {%Y-%m-%d %H:%M:%S} -set limitdiffs 1 -set uicolor grey85 -set want_ttk 1 -set bgcolor white -set fgcolor black -set colors {green red blue magenta darkgrey brown orange} -set diffcolors {red "#00a000" blue} -set markbgcolor #e0e0ff -set diffcontext 4 -set selectbgcolor gray85 -set extdifftool meld -set perfile_attrs 0 -set geometry(main) 1364x690+0+0 -set geometry(state) normal -set geometry(topwidth) 1364 -set geometry(topheight) 358 -set geometry(pwsash0) "617 1" -set geometry(pwsash1) "1025 1" -set geometry(botwidth) 889 -set geometry(botheight) 327 -set permviews {} diff --git a/.config/git/ignore b/.config/git/ignore deleted file mode 100644 index e69de29..0000000 --- a/.config/git/ignore +++ /dev/null diff --git a/.gitconfig b/.gitconfig index 653bc6e..218b006 120000..100644 --- a/.gitconfig +++ b/.gitconfig @@ -1 +1,14 @@ -.config/git/config
\ No newline at end of file +[user] + name = Luke Shumaker + email = LukeShu@sbcglobal.net +[color] + ui = auto +[sendemail] + smtpencryption = ssl + smtpserver = plus.smtp.mail.yahoo.com + smtpuser = lukeshu@sbcglobal.net + smtpserverport = 465 +[push] + default = matching +[alias] + lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative diff --git a/.gitignore b/.gitignore index 9592ae4..e69de29 120000..100644 --- a/.gitignore +++ b/.gitignore @@ -1 +0,0 @@ -.config/git/ignore
\ No newline at end of file @@ -1 +1,36 @@ -.config/git/gitk
\ No newline at end of file +set mainfont {Helvetica 9} +set textfont {{DejaVu Sans Mono} 9} +set uifont {Helvetica 9 bold} +set tabstop 8 +set findmergefiles 0 +set maxgraphpct 50 +set maxwidth 16 +set cmitmode patch +set wrapcomment none +set autoselect 1 +set autosellen 40 +set showneartags 1 +set hideremotes 0 +set showlocalchanges 1 +set datetimeformat {%Y-%m-%d %H:%M:%S} +set limitdiffs 1 +set uicolor grey85 +set want_ttk 1 +set bgcolor white +set fgcolor black +set colors {green red blue magenta darkgrey brown orange} +set diffcolors {red "#00a000" blue} +set markbgcolor #e0e0ff +set diffcontext 4 +set selectbgcolor gray85 +set extdifftool meld +set perfile_attrs 0 +set geometry(main) 1364x658+0+0 +set geometry(state) normal +set geometry(topwidth) 1364 +set geometry(topheight) 358 +set geometry(pwsash0) "617 1" +set geometry(pwsash1) "1025 1" +set geometry(botwidth) 889 +set geometry(botheight) 295 +set permviews {} |