sync/git/gitconfig

[user]
	name = Austen Adler
  email = stonewareslord@gmail.com
[alias]
  i = "!git br&&git st"
  pul = pull
  pus = push --all
  co = checkout
  ci = commit -m
  a = add
  st = status
  br = branch -av
  hist = log --all --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --abbrev-commit
  type = cat-file -t
  dump = cat-file -p
  d = difftool
  cbranch  = !sh -c 'git commit -m \"$2\"&&git branch $1&&git reset --hard HEAD~1&&git co \"$1\"' -
  size = "!git diff --cached --binary | wc -c | numfmt --to=iec-i"
[push]
  default = matching
[core]
  excludesfile = /home/stonewareslord/.gitignore_global
[diff]
  tool = vimdiff
[difftool]
  prompt = false
[merge]
  tool = diffconflicts
[mergetool "diffconflicts"]
  cmd = diffconflicts vim $BASE $LOCAL $REMOTE $MERGED
  trustExitCode = true
  keepBackup = false
[http]
  sslVerify = false
Initial commit 2014-04-19 13:25:29 -04:00			`[user]`
Added README.md, used full name for gitconfig and added Ultisnips, vimsnippets, and neocomplete to vimrc 2014-08-02 00:38:28 -04:00			`name = Austen Adler`
Initial commit 2014-04-19 13:25:29 -04:00			`email = stonewareslord@gmail.com`
			`[alias]`
Added autojump command and git i command 2014-06-08 20:52:22 -04:00			`i = "!git br&&git st"`
Updated gitconfig and vimrc 2014-05-30 12:45:50 -04:00			`pul = pull`
			`pus = push --all`
Initial commit 2014-04-19 13:25:29 -04:00			`co = checkout`
			`ci = commit -m`
			`a = add`
			`st = status`
Added br verbose. gt and gT for hiding toolbars. Added compile with F3 in vimrc 2014-05-17 14:09:38 -04:00			`br = branch -av`
Fixed git hist 2014-05-27 19:36:53 -04:00			`hist = log --all --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --abbrev-commit`
Initial commit 2014-04-19 13:25:29 -04:00			`type = cat-file -t`
			`dump = cat-file -p`
Fixed indentation on gitconfig 2014-06-16 18:58:00 -04:00			`d = difftool`
Added tmux 256 color mode! Alias ls with -F only if not mac computer. Swapped cbranch arguements. Added solarized 256 colorscheme to tmux.conf. Sent titlestring of tmux to the tmux process running 2014-06-28 02:16:07 -04:00			`cbranch = !sh -c 'git commit -m \"$2\"&&git branch $1&&git reset --hard HEAD~1&&git co \"$1\"' -`
Added git size command, extract now works with tar.xz. Vimperatorrc now auto-unmaps commands and <C-{b,w,d}> work 2014-07-23 19:19:52 -04:00			`size = "!git diff --cached --binary \| wc -c \| numfmt --to=iec-i"`
Initial commit 2014-04-19 13:25:29 -04:00			`[push]`
Fixed indentation on gitconfig 2014-06-16 18:58:00 -04:00			`default = matching`
Initial commit 2014-04-19 13:25:29 -04:00			`[core]`
			`excludesfile = /home/stonewareslord/.gitignore_global`
			`[diff]`
Fixed indentation on gitconfig 2014-06-16 18:58:00 -04:00			`tool = vimdiff`
Initial commit 2014-04-19 13:25:29 -04:00			`[difftool]`
Fixed indentation on gitconfig 2014-06-16 18:58:00 -04:00			`prompt = false`
Initial commit 2014-04-19 13:25:29 -04:00			`[merge]`
			`tool = diffconflicts`
			`[mergetool "diffconflicts"]`
			`cmd = diffconflicts vim $BASE $LOCAL $REMOTE $MERGED`
			`trustExitCode = true`
			`keepBackup = false`
			`[http]`
			`sslVerify = false`