Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Newer
Older
100644 123 lines (105 sloc) 3.156 kb
a837bed9 »
2008-11-22 Add .gitconfig and Regexp::Common misc script
1 [user]
c517ff4a »
2012-02-04 [git] Add a wip shortcut for stash and other tweaks
2 name = Jonathan "Duke" Leto
3 email = <jonathan@leto.net>
d1d9fc48 »
2009-05-19 Update .gitconfig with more Kung Fu
4 editor = vim
a837bed9 »
2008-11-22 Add .gitconfig and Regexp::Common misc script
5
6 [alias]
3d11d706 »
2011-05-25 Update .gitconfig and .vimrc
7 # this assumes that we want to push HEAD to a remote called origin (usually an upstream repo)
8 # as well as a remote called "leto" (usually my fork of something)
9 spread = !git push --tags origin HEAD && git push --tags leto HEAD
9af9be05 »
2012-03-28 Alphabetize my git aliases and add some more laziness
10
45bcdc5f » Duke Leto
2014-04-22 Make regard/disregard aliases work correctly
11 disregard = update-index --assume-unchanged
12 regard = update-index --no-assume-unchanged
8e325543 » Duke Leto
2014-04-22 Add git disregard/regard aliases
13
9af9be05 »
2012-03-28 Alphabetize my git aliases and add some more laziness
14 a = add
48eeb3ec »
2012-03-28 Add more git alias awesomesauce
15 addp = add --patch
55e27729 »
2012-03-29 Make 'git axe' show commit diffs
16 axe = !sh -c 'git log -p -S"$0"'
9fee271b »
2009-07-31 update my git aliases and /etc/hosts
17 back = checkout -
9af9be05 »
2012-03-28 Alphabetize my git aliases and add some more laziness
18 b = branch
19 c = commit
20 co = checkout
a4351992 »
2013-04-24 Update .gitconfig
21 clone-shallow = clone --depth 5
9af9be05 »
2012-03-28 Alphabetize my git aliases and add some more laziness
22 cudgel = clean -fdx
23 detach = checkout @{0}
b2852966 »
2012-03-28 fix bug in git delete alias
24 delete = !sh -c 'git push "$0" :refs/heads/"$1"' # delete remote branch with git delete foo
9af9be05 »
2012-03-28 Alphabetize my git aliases and add some more laziness
25 faster = repack -a -d -f --window=200 --window-memory=1g
26 f = fetch
f0232b67 »
2009-08-25 add nopaste and git flog
27 flog = reflog
48eeb3ec »
2012-03-28 Add more git alias awesomesauce
28 fold = merge --no-ff
9af9be05 »
2012-03-28 Alphabetize my git aliases and add some more laziness
29 hist = log --pretty=format:'%C(yellow)%h%Creset %s %Cred%an%Creset %Cblue%d%Creset %Cgreen%cr%Creset %cd' --graph --all
30 h = log --pretty=format:'%C(yellow)%h%Creset %s %Cred%an%Creset %Cblue%d%Creset %Cgreen%cr%Creset %cd' --graph --all
31 last = cat-file commit HEAD
32 lp = log -p
33 pick = cherry-pick
34 p = push
35 praise = blame
3b5f65d6 »
2010-12-03 Add some git aliases
36 pr = pull --rebase
4d57f0e8 »
2011-04-21 Add more laziness to my .gitconfig
37 pu = push
9af9be05 »
2012-03-28 Alphabetize my git aliases and add some more laziness
38 pus = push
39 r = remote
40 sha1 = rev-parse
68c6ba65 »
2012-02-08 because i am this lazy
41 s = status
9af9be05 »
2012-03-28 Alphabetize my git aliases and add some more laziness
42 sup = !git stash && git svn rebase && git stash pop
48eeb3ec »
2012-03-28 Add more git alias awesomesauce
43 staged = diff --cached
9af9be05 »
2012-03-28 Alphabetize my git aliases and add some more laziness
44 up = !git stash && git pull --rebase origin master && git stash pop
48eeb3ec »
2012-03-28 Add more git alias awesomesauce
45 unstage= reset HEAD --
9af9be05 »
2012-03-28 Alphabetize my git aliases and add some more laziness
46 v = !git --version
47 who = shortlog -se --
c517ff4a »
2012-02-04 [git] Add a wip shortcut for stash and other tweaks
48 wip = stash
6d5a4ade »
2013-06-18 Add g sync and tex binaries to my PATH
49 sync = commit -am "sync"
c517ff4a »
2012-02-04 [git] Add a wip shortcut for stash and other tweaks
50
5bdde07f »
2011-01-11 git lazyrebase
51 lazyrebase = !git stash && git pull --rebase && git stash pop
c517ff4a »
2012-02-04 [git] Add a wip shortcut for stash and other tweaks
52 unmerged = branch --no-merged
9fee271b »
2009-07-31 update my git aliases and /etc/hosts
53
48eeb3ec »
2012-03-28 Add more git alias awesomesauce
54 pull-all-submodules = submodule foreach "git checkout master && git pull origin master"
55
360cbcda »
2009-07-31 fix git aliases
56 [core]
5c20243a »
2013-02-01 Add .gitconfig modifications from sourcetree
57 excludesfile = ~/.gitignore_global
360cbcda »
2009-07-31 fix git aliases
58 editor = vim
59 pager = less -FXRS
60 filemode = true
61 logallrefupdates = true
62 autocrlf = false
63 whitespace = trailing-space,space-before-tab,cr-at-eol
64 # enable if you are on NFS
65 #preloadindex = true
66
9fee271b »
2009-07-31 update my git aliases and /etc/hosts
67 [log]
68 date = local
a837bed9 »
2008-11-22 Add .gitconfig and Regexp::Common misc script
69
bfb83afa »
2011-02-24 Improve up .gitconfig
70 # This Does Bad Things
a837bed9 »
2008-11-22 Add .gitconfig and Regexp::Common misc script
71 [apply]
a8b2869a »
2010-07-07 Update bash stuff
72 # whitespace = strip
a837bed9 »
2008-11-22 Add .gitconfig and Regexp::Common misc script
73
74 [diff]
cf467820 »
2009-08-14 Add parrot_svn_ps and refactor my .gitconfig due to scolding by @jhelwig
75 rename = copy
7f8ed52a »
2013-04-09 Have patience, my son
76 algorithm = patience
a837bed9 »
2008-11-22 Add .gitconfig and Regexp::Common misc script
77
46647e10 »
2012-03-28 Make git smarter when generating ruby diffs and turn on autocorrection
78 [diff "ruby"]
79 funcname="^ *\\(\\(class\\|module\\|def\\) .*\\)"
80
a837bed9 »
2008-11-22 Add .gitconfig and Regexp::Common misc script
81 [color]
bfb83afa »
2011-02-24 Improve up .gitconfig
82 ui = auto
83 diff = auto
84 branch = auto
85 status = auto
a837bed9 »
2008-11-22 Add .gitconfig and Regexp::Common misc script
86
87 [color "diff"]
bfb83afa »
2011-02-24 Improve up .gitconfig
88 meta = yellow
89 frag = cyan
90 old = red bold
91 new = green bold
92 whitespace = red reverse
a837bed9 »
2008-11-22 Add .gitconfig and Regexp::Common misc script
93
94 [color "status"]
bfb83afa »
2011-02-24 Improve up .gitconfig
95 added = yellow
96 changed = green
cf467820 »
2009-08-14 Add parrot_svn_ps and refactor my .gitconfig due to scolding by @jhelwig
97 untracked = cyan
d1d9fc48 »
2009-05-19 Update .gitconfig with more Kung Fu
98
6c36a807 »
2009-09-04 Make the current branch the default when pushing
99 [push]
bfb83afa »
2011-02-24 Improve up .gitconfig
100 default = current
101
bf285f38 »
2010-03-11 Update $PATH, some git settings and add an alias for the parrot shell
102 [rerere]
bfb83afa »
2011-02-24 Improve up .gitconfig
103 enabled = 1
db2fe728 »
2010-07-19 Update .gitconfig for use with git send-email
104
105 [sendemail]
7704e82f »
2012-09-24 [git] use non-deprecated way to specify gmail
106 smtpserver = smtp.gmail.com
107 smtpuser = jaleto@gmail.com
108 smtpencryption = tls
109 smtpserverport = 587
db2fe728 »
2010-07-19 Update .gitconfig for use with git send-email
110
46647e10 »
2012-03-28 Make git smarter when generating ruby diffs and turn on autocorrection
111 [help]
9826f6a7 »
2013-04-24 Update .gitconfig
112 autocorrect = 10
46647e10 »
2012-03-28 Make git smarter when generating ruby diffs and turn on autocorrection
113
54351a5c »
2010-09-29 show git rebase stats
114 [rebase]
bfb83afa »
2011-02-24 Improve up .gitconfig
115 stat = 1
3d11d706 »
2011-05-25 Update .gitconfig and .vimrc
116 [github]
117 user = leto
5c20243a »
2013-02-01 Add .gitconfig modifications from sourcetree
118 [difftool "sourcetree"]
119 cmd = opendiff \"$LOCAL\" \"$REMOTE\"
120 path =
121 [mergetool "sourcetree"]
122 cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
123 trustExitCode = true
Something went wrong with that request. Please try again.