Permalink
Browse files

Updated git aliases & configs, fixed typo, and removed git_template (…

…for now).
  • Loading branch information...
1 parent da4ffb9 commit 40c7059fd17633287a02e20e0bd83b75c18806ec @ggamel committed Jan 21, 2013
View
@@ -0,0 +1,13 @@
+export GHI_PAGER=less
+export GIT_SANDBOX=~/Do/sandbox
+export GIT_MERGE_AUTOEDIT=no
+
+# tl;dr hub is better than vanilla git
+hub_path=$(which hub)
+if (( $+commands[hub] ))
+then
+ alias git=$hub_path
+fi
+# make g alias git, which is actually hub: less typing
+alias g='git'
+
@@ -21,5 +21,4 @@ if declare -f _git_commands > /dev/null; then
eval "$(declare -f _git_commands | sed -e 's/base_commands=(/base_commands=(${_hub_commands} /')"
fi
-compdef g=git
-
+compdef g=git
View
@@ -0,0 +1,11 @@
+function minutes_since_last_commit {
+ now=`date +%s`
+ last_commit=`git log --pretty=format:'%at' -1`
+ seconds_since_last_commit=$((now-last_commit))
+ minutes_since_last_commit=$((seconds_since_last_commit/60))
+ echo $minutes_since_last_commit
+}
+
+function sandbox() {
+ cd $GIT_SANDBOX && git clone $1 && cd `last_modified`
+}
View
@@ -1,34 +0,0 @@
-export GHI_PAGER=less
-export GIT_SANDBOX=~/Do/sandbox
-export GIT_MERGE_AUTOEDIT=no
-
-if [[ -f `command -v hub` ]] ; then alias git=hub ; fi
-
-alias g='git'
-
-# Git flow
-alias gff='git flow feature'
-alias gffs='git flow feature start'
-alias gfff='git flow feature finish'
-alias gfr='git flow release'
-alias gfrs='git flow release start'
-alias gfrf='git flow release finish'
-alias gfh='git flow hotfix'
-alias gfhs='git flow hotfix start'
-alias gfhf='git flow hotfix finish'
-alias gfs='git flow support'
-alias gfss='git flow support start'
-
-alias gst='git status'
-
-function minutes_since_last_commit {
- now=`date +%s`
- last_commit=`git log --pretty=format:'%at' -1`
- seconds_since_last_commit=$((now-last_commit))
- minutes_since_last_commit=$((seconds_since_last_commit/60))
- echo $minutes_since_last_commit
-}
-
-function sandbox() {
- cd $GIT_SANDBOX && git clone $1 && cd `last_modified`
-}
@@ -1,3 +0,0 @@
-#!/bin/sh
-rm -f .git/tags
-ctags --tag-relative -Rf.git/tags --exclude=.git --languages=-javascript,sql
@@ -1,2 +0,0 @@
-#!/bin/sh
-.git/hooks/ctags >/dev/null 2>&1 &
@@ -1,2 +0,0 @@
-#!/bin/sh
-.git/hooks/ctags >/dev/null 2>&1 &
@@ -1,2 +0,0 @@
-#!/bin/sh
-.git/hooks/ctags >/dev/null 2>&1 &
@@ -1,4 +0,0 @@
-#!/bin/sh
-case "$1" in
- rebase) exec .git/hooks/post-merge ;;
-esac
View
@@ -1,6 +1,7 @@
[user]
name = Greg Gamel
email = ggamel@gmail.com
+ helper = osxkeychain
[color]
ui = auto
@@ -63,32 +64,36 @@
wtf = !$ZSH/bin/git-wtf
[core]
- excludesfile = /Users/ggamel/.gitignore_global
+ excludesfile = ~/.gitignore_global
editor = subl -w
+ quotepath = false
[branch]
autosetuprebase = always
-[init]
- templatedir = ~/.git_template
-
[github]
user = ggamel
+[hub]
+ protocol = https
+
[mergetool]
keepBackup = false
[push]
default = upstream
-[credential]
- helper = osxkeychain
-
[difftool "Kaleidoscope"]
cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
-
+
[diff]
tool = Kaleidoscope
+
+[help]
+ autocorrect = 1
+
+[apply]
+ whitespace = nowarn

0 comments on commit 40c7059

Please sign in to comment.