summaryrefslogtreecommitdiff
path: root/.gitconfig
diff options
context:
space:
mode:
authorMike Crute <mcrute@gmail.com>2014-04-30 07:26:00 -0700
committerMike Crute <mike@crute.us>2014-04-30 07:26:00 -0700
commitd0560a2959293b6dd2c30564732722df8ff48104 (patch)
tree0d0ea269a86381a3c911e119ac3f3b8260daf20d /.gitconfig
parentff4b737899f7b040078737d885f0656a16ee2b25 (diff)
downloaddotfiles-d0560a2959293b6dd2c30564732722df8ff48104.tar.bz2
dotfiles-d0560a2959293b6dd2c30564732722df8ff48104.tar.xz
dotfiles-d0560a2959293b6dd2c30564732722df8ff48104.zip
New git aliases
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig7
1 files changed, 4 insertions, 3 deletions
diff --git a/.gitconfig b/.gitconfig
index 72bff84..8b91eb7 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -24,24 +24,25 @@
24 co = checkout 24 co = checkout
25 sm = submodule 25 sm = submodule
26 26
27 fm = merge --ff-only origin/master 27 fm = merge --ff-only origin/mainline
28 pr = pull --rebase 28 pr = pull --rebase
29 ar = add -A 29 ar = add -A
30 rc = rebase --continue 30 rc = rebase --continue
31 ri = rebase -i 31 ri = rebase -i
32 dc = diff --cached 32 dc = diff --cached
33 rc = rm --cached 33 rc = rm --cached
34 in = !git l ..origin/master 34 in = !git l ..origin/mainline
35 ra = !git l --all -20 35 ra = !git l --all -20
36 lp = log --format=full -p -1 36 lp = log --format=full -p -1
37 lf = log --format=fuller -p 37 lf = log --format=fuller -p
38 sl = !git l -n 10
38 ca = commit -v --amend 39 ca = commit -v --amend
39 ap = add -p 40 ap = add -p
40 br = branch -a 41 br = branch -a
41 42
42 arp = add -A -p 43 arp = add -A -p
43 put = push origin head 44 put = push origin head
44 out = !git l origin/master.. 45 out = !git l origin/mainline..
45 46
46[color] 47[color]
47 ui = auto 48 ui = auto