From e2b68c4a4e23223cc467f75404f462f18850075b Mon Sep 17 00:00:00 2001 From: Kyle West Date: Tue, 24 Jan 2012 22:43:08 -0500 Subject: [PATCH] moved gitconfig and ignore to git directory. symlinks created but will be removed at some point. --- git/gitconfig | 112 ++++++++++++++++++++++++++++++++++++++++++++++ git/gitignore | 32 ++++++++++++++ gitconfig | 113 +---------------------------------------------- gitignore_global | 33 +------------- 4 files changed, 146 insertions(+), 144 deletions(-) create mode 100644 git/gitconfig create mode 100644 git/gitignore mode change 100644 => 120000 gitconfig mode change 100644 => 120000 gitignore_global diff --git a/git/gitconfig b/git/gitconfig new file mode 100644 index 0000000..a6fc103 --- /dev/null +++ b/git/gitconfig @@ -0,0 +1,112 @@ +# set your user tokens as enivornment variables, such as ~/.secrets +# See the README for examples. +[color] + ui = true +[color "branch"] + current = yellow reverse + local = yellow + remote = green +[color "diff"] + meta = yellow bold + frag = magenta bold + old = red bold + new = green bold +[alias] + # add + a = add # add + chunkyadd = add --patch # stage commits chunk by chunk + + # branch + b = branch -v # branch (verbose) + + # commit + c = commit -m # commit with message + ca = commit -am # commit all with message + ci = commit # commit + amend = commit --amend # ammend your last commit + ammend = commit --amend # ammend your last commit + + # checkout + co = checkout # checkout + nb = checkout -b # create and switch to a new branch (mnemonic: "git new branch branchname...") + + # cherry-pick + cp = cherry-pick -x # grab a change from a branch + + # diff + d = diff # diff unstaged changes + dc = diff --cached # diff staged changes + last = diff HEAD^ # diff last committed change + + # log + log = log --decorate --graph --date=short + l = log + changes = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" --name-status + short = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" + changelog = log --pretty=format:\" * %s\" + shortnocolor = log --pretty=format:\"%h %cr %cn %s\" + + # pull + pl = pull # pull + + # push + ps = push # push + + # rebase + rc = rebase --continue # continue rebase + rs = rebase --skip # skip rebase + + # remote + r = remote -v # show remotes (verbose) + + # reset + unstage = reset HEAD # remove files from index (tracking) + uncommit = reset --soft HEAD^ # go back before last commit, with files in uncommitted state + filelog = log -u # show changes to a file + mt = mergetool # fire up the merge tool + + # stash + ss = stash # stash changes + sl = stash list # list stashes + sa = stash apply # apply stash (restore changes) + sd = stash drop # drop stashes (destory changes) + + # status + s = status # status + st = status # status + stat = status # status + + # tag + t = tag -n # show tags with lines of each tag message + + # svn helpers + svnr = svn rebase + svnd = svn dcommit + svnl = svn log --oneline --show-commit +[format] + pretty = format:%C(blue)%ad%Creset %C(yellow)%h%C(green)%d%Creset %C(blue)%s %C(magenta) [%an]%Creset +[merge] + summary = true + verbosity = 1 +[apply] + whitespace = nowarn +[branch] + autosetupmerge = true +[push] + # 'git push' will push the current branch to its tracking branch + # the usual default is to push all branches + default = tracking +[core] + autocrlf = false + editor = vim + excludesfile = ~/.dotfiles/gitignore_global +[advice] + statusHints = false +[diff] + # Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject + # instead of a/b/c/d as prefixes for patches + mnemonicprefix = true +[rerere] + # Remember my merges + # http://gitfu.wordpress.com/2008/04/20/git-rerere-rereremember-what-you-did-last-time/ + enabled = true diff --git a/git/gitignore b/git/gitignore new file mode 100644 index 0000000..e807a85 --- /dev/null +++ b/git/gitignore @@ -0,0 +1,32 @@ +# OSX taken from: https://github.com/github/gitignore/blob/master/Global/OSX.gitignore +# ---------------------------------------------------------------------------------------------- +.DS_Store +# Thumbnails +._* +# Files that might appear on external disk +.Spotlight-V100 +.Trashes + +# Windows taken from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore +# ---------------------------------------------------------------------------------------------- +# Windows image file caches +Thumbs.db + +# Folder config file +Desktop.ini + +# Tags taken from: https://github.com/github/gitignore/blob/master/Global/Tags.gitignore +# ---------------------------------------------------------------------------------------------- +# Ignore tags created by etags and ctags +TAGS +tags + +# Vim taken from: https://github.com/github/gitignore/blob/master/Global/vim.gitignore +# ---------------------------------------------------------------------------------------------- +.*.sw[a-z] +*.un~ +Session.vim + +# SASS +# ---------------------------------------------------------------------------------------------- +.sass-cache diff --git a/gitconfig b/gitconfig deleted file mode 100644 index a6fc103..0000000 --- a/gitconfig +++ /dev/null @@ -1,112 +0,0 @@ -# set your user tokens as enivornment variables, such as ~/.secrets -# See the README for examples. -[color] - ui = true -[color "branch"] - current = yellow reverse - local = yellow - remote = green -[color "diff"] - meta = yellow bold - frag = magenta bold - old = red bold - new = green bold -[alias] - # add - a = add # add - chunkyadd = add --patch # stage commits chunk by chunk - - # branch - b = branch -v # branch (verbose) - - # commit - c = commit -m # commit with message - ca = commit -am # commit all with message - ci = commit # commit - amend = commit --amend # ammend your last commit - ammend = commit --amend # ammend your last commit - - # checkout - co = checkout # checkout - nb = checkout -b # create and switch to a new branch (mnemonic: "git new branch branchname...") - - # cherry-pick - cp = cherry-pick -x # grab a change from a branch - - # diff - d = diff # diff unstaged changes - dc = diff --cached # diff staged changes - last = diff HEAD^ # diff last committed change - - # log - log = log --decorate --graph --date=short - l = log - changes = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" --name-status - short = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" - changelog = log --pretty=format:\" * %s\" - shortnocolor = log --pretty=format:\"%h %cr %cn %s\" - - # pull - pl = pull # pull - - # push - ps = push # push - - # rebase - rc = rebase --continue # continue rebase - rs = rebase --skip # skip rebase - - # remote - r = remote -v # show remotes (verbose) - - # reset - unstage = reset HEAD # remove files from index (tracking) - uncommit = reset --soft HEAD^ # go back before last commit, with files in uncommitted state - filelog = log -u # show changes to a file - mt = mergetool # fire up the merge tool - - # stash - ss = stash # stash changes - sl = stash list # list stashes - sa = stash apply # apply stash (restore changes) - sd = stash drop # drop stashes (destory changes) - - # status - s = status # status - st = status # status - stat = status # status - - # tag - t = tag -n # show tags with lines of each tag message - - # svn helpers - svnr = svn rebase - svnd = svn dcommit - svnl = svn log --oneline --show-commit -[format] - pretty = format:%C(blue)%ad%Creset %C(yellow)%h%C(green)%d%Creset %C(blue)%s %C(magenta) [%an]%Creset -[merge] - summary = true - verbosity = 1 -[apply] - whitespace = nowarn -[branch] - autosetupmerge = true -[push] - # 'git push' will push the current branch to its tracking branch - # the usual default is to push all branches - default = tracking -[core] - autocrlf = false - editor = vim - excludesfile = ~/.dotfiles/gitignore_global -[advice] - statusHints = false -[diff] - # Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject - # instead of a/b/c/d as prefixes for patches - mnemonicprefix = true -[rerere] - # Remember my merges - # http://gitfu.wordpress.com/2008/04/20/git-rerere-rereremember-what-you-did-last-time/ - enabled = true diff --git a/gitconfig b/gitconfig new file mode 120000 index 0000000..1536166 --- /dev/null +++ b/gitconfig @@ -0,0 +1 @@ +git/gitconfig \ No newline at end of file diff --git a/gitignore_global b/gitignore_global deleted file mode 100644 index e807a85..0000000 --- a/gitignore_global +++ /dev/null @@ -1,32 +0,0 @@ -# OSX taken from: https://github.com/github/gitignore/blob/master/Global/OSX.gitignore -# ---------------------------------------------------------------------------------------------- -.DS_Store -# Thumbnails -._* -# Files that might appear on external disk -.Spotlight-V100 -.Trashes - -# Windows taken from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore -# ---------------------------------------------------------------------------------------------- -# Windows image file caches -Thumbs.db - -# Folder config file -Desktop.ini - -# Tags taken from: https://github.com/github/gitignore/blob/master/Global/Tags.gitignore -# ---------------------------------------------------------------------------------------------- -# Ignore tags created by etags and ctags -TAGS -tags - -# Vim taken from: https://github.com/github/gitignore/blob/master/Global/vim.gitignore -# ---------------------------------------------------------------------------------------------- -.*.sw[a-z] -*.un~ -Session.vim - -# SASS -# ---------------------------------------------------------------------------------------------- -.sass-cache diff --git a/gitignore_global b/gitignore_global new file mode 120000 index 0000000..28dd79f --- /dev/null +++ b/gitignore_global @@ -0,0 +1 @@ +git/gitignore \ No newline at end of file