diff options
Diffstat (limited to '.gitconfig')
| -rw-r--r-- | .gitconfig | 115 |
1 files changed, 0 insertions, 115 deletions
diff --git a/.gitconfig b/.gitconfig deleted file mode 100644 index 8a1c72c..0000000 --- a/.gitconfig +++ /dev/null @@ -1,115 +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 - l = log --graph --date=short -n 10 - lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'│ --abbrev-commit --date=relative - 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 <n> 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 = ~/.yadr/git/gitignore -[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 -[user] - email = david.runge@frqrec.com - name = David Runge |