Merge remote-tracking branch 'origin/master'

3 files changed, 124 insertions, 0 deletions

diff --git a/git/.config/git/config b/git/.config/git/config
new file mode 100644
index 00000000..6228a08b
--- /dev/null
+++ b/git/.config/git/config
@@ -0,0 +1,34 @@
+[user]
+	email = alan@alanpearce.uk
+	name = Alan Pearce
+[color]
+	branch = auto
+	diff = auto
+	status = auto
+	ui = true
+[push]
+	default = current
+[alias]
+	up = merge FETCH_HEAD
+	st = status -sb
+	ci = commit
+	br = branch
+	co = checkout
+	ready = rebase -i @{u}
+	lg = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
+	standup = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --since yesterday --author Alan
+	ignored = ls-files --others -i --exclude-standard
+	pr = pull-request
+	delete-merged = "!sh -c 'git branch --merged | grep -v "\\*" | grep -v master | grep -v dev | xargs -n 1 git branch -d'"
+[github]
+	user = alan@alanpearce.uk
+[diff]
+	algorithm = patience
+[include]
+	path = config.local
+[core]
+	excludesfile = ~/.config/git/ignore
+[rebase]
+	autosquash = true
+[rerere]
+	enabled = true
diff --git a/git/.config/git/gitk b/git/.config/git/gitk
new file mode 100644
index 00000000..0eb9a033
--- /dev/null
+++ b/git/.config/git/gitk
@@ -0,0 +1,61 @@
+set mainfont {{Lucida Grande} 12}
+set textfont {Monaco 12}
+set uifont {{Lucida Grande} 12 bold}
+set tabstop 4
+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 maxrefs 20
+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 uifgcolor black
+set uifgdisabledcolor #999
+set colors {green red blue magenta darkgrey brown orange}
+set diffcolors {red "#00a000" blue}
+set mergecolors {red blue green purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
+set markbgcolor #e0e0ff
+set diffcontext 3
+set selectbgcolor gray85
+set foundbgcolor yellow
+set currentsearchhitbgcolor orange
+set extdifftool opendiff
+set perfile_attrs 0
+set headbgcolor green
+set headfgcolor black
+set headoutlinecolor black
+set remotebgcolor #ffddaa
+set tagbgcolor yellow
+set tagfgcolor black
+set tagoutlinecolor black
+set reflinecolor black
+set filesepbgcolor #aaaaaa
+set filesepfgcolor black
+set linehoverbgcolor #ffff80
+set linehoverfgcolor black
+set linehoveroutlinecolor black
+set mainheadcirclecolor yellow
+set workingfilescirclecolor red
+set indexcirclecolor green
+set circlecolors {white blue gray blue blue}
+set linkfgcolor blue
+set circleoutlinecolor black
+set geometry(main) 1477x845+26+50
+set geometry(state) normal
+set geometry(topwidth) 1477
+set geometry(topheight) 300
+set geometry(pwsash0) "378 1"
+set geometry(pwsash1) "569 1"
+set geometry(botwidth) 473
+set geometry(botheight) 675
+set permviews {}
diff --git a/git/.config/git/ignore b/git/.config/git/ignore
new file mode 100644
index 00000000..d7189dc5
--- /dev/null
+++ b/git/.config/git/ignore
@@ -0,0 +1,29 @@
+.DS_Store
+.AppleDouble
+.LSOverride
+Icon
+Desktop.ini
+
+# Thumbnails
+._*
+Thumbs.db
+
+# Emacs
+*~
+\#*\#
+/.emacs.desktop
+/.emacs.desktop.lock
+.elc
+auto-save-list
+tramp
+.\#*
+
+# Org-mode
+.org-id-locations
+*_archive
+
+GPATH
+GRTAGS
+GTAGS
+
+.tern-port
\ No newline at end of file