Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update gitconfig

  • Loading branch information...
commit b5a60b76628f27829b849588cb99eac22c138ed4 1 parent da5e30e
@Elland authored
Showing with 33 additions and 15 deletions.
  1. +33 −15 gitconfig
View
48 gitconfig
@@ -4,8 +4,11 @@
[diff]
[color]
ui = auto
-[core]
- editor = vim
+[branch "master"]
+ remote = origin
+ merge = refs/heads/master
+ rebase = true
+ autosetuprebase = always
[alias]
co = !git checkout
a = !git add . -vA
@@ -30,27 +33,42 @@
ds = diff --stat=160,120
dh1 = diff HEAD~1
- # Divergence (commits we added and commits remote added)
+ # Divergence (commits we added and commits remote added)
div = divergence
- # Goodness (summary of diff lines added/removed/total)
+ # Goodness (summary of diff lines added/removed/total)
gn = goodness
gnc = goodness --cached
- # Fancy logging.
- # h = head
- # hp = head with patch
- # r = recent commits, only current branch
- # ra = recent commits, all reachable refs
- # l = all commits, only current branch
- # la = all commits, all reachable refs
+ # Fancy logging.
+ # h = head
+ # hp = head with patch
+ # r = recent commits, only current branch
+ # ra = recent commits, all reachable refs
+ # l = all commits, only current branch
+ # la = all commits, all reachable refs
head = !git l -1
h = !git head
- hp = "!source ~/.githelpers && show_git_head"
+ hp = "!. ~/.githelpers && show_git_head"
r = !git l -30
ra = !git r --all
- l = "!source ~/.githelpers && pretty_git_log"
+ l = "!. ~/.githelpers && pretty_git_log"
la = !git l --all
-
+ lng = "!. ~/.githelpers && pretty_git_log_no_graph"
+ lgn = lng
+ rc = rebase --continue
+ pug = push github github:master
[merge]
- tool = vimdiff
+ tool = Kaleidoscope
+[difftool "Kaleidoscope"]
+ cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
+[diff]
+ tool = Kaleidoscope
+[difftool]
+ prompt = false
+[mergetool "Kaleidoscope"]
+ cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
+[mergetool]
+ prompt = false
+[core]
+ excludesfile = /Users/elland/.gitignore
Please sign in to comment.
Something went wrong with that request. Please try again.