Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Newer
Older
100755 158 lines (145 sloc) 5.462 kb
9a6723d @matthewmccullough Many updates
authored
1 [user]
2 name = Matthew McCullough
3 email = matthewm@ambientideas.com
4
5 [color]
6 # ui = true is a superset of all the more specific color options
7 # as documented at http://book.git-scm.com/5_customizing_git.html
8 # When set to always, always use colors in all git commands which are capable of colored output.
9 # When false, never. When set to true or auto, use colors only when the output is to the terminal.
10 # When more specific variables of color.* are set, they always take precedence over this setting.
11 # Defaults to false.
12 ui = auto
13 # diff = auto
14 # status = auto
15 # branch = auto
16
17 [gui]
18 fontdiff = -family Monaco -size 10 -weight normal -slant roman -underline 0 -overstrike 0
1b8a434 @matthewmccullough Separating the global git ignore from the repo-specific one
authored
19 recentrepo = /Users/mccm06/Documents/Temp/Scratch/hello/hgw1
9a6723d @matthewmccullough Many updates
authored
20
21 [core]
22 excludesfile = ~/.gitignore
23 quotepath = false
24 autocrlf = input
25 safecrlf = warn
26 editor = mate -w
27
28 [alias]
29 br = branch -a
9ac1162 @matthewmccullough Formatting indents, adding logging commands to git configuration
authored
30 s = status -s -u
9a6723d @matthewmccullough Many updates
authored
31 cl = log --stat -C -2
32 c = commit
33 co = checkout
34 d = diff --color-words
35 dh = diff HEAD
36 dc = diff --staged
37 dw = diff --word-diff
38 dcw = diff --color-words
39 dm = !git diff | mate
40 dv = !git diff | vim
41 who = shortlog -s --
42 ph = push
43 pl = pull
44 lp = log -p
45 lod = log --oneline --decorate
46 lg = log --graph
47 lpo = log --pretty=oneline --abbrev-commit --graph --decorate --all
9ac1162 @matthewmccullough Formatting indents, adding logging commands to git configuration
authored
48 l1 = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
49 l2 = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
9a6723d @matthewmccullough Many updates
authored
50 spull = !git-svn fetch && git-svn rebase
51 spush = !git-svn dcommit
52 sync = !git pull && git push
53 es = !git pull --rebase && git push
54 lf = log --pretty=fuller
55 ignorechanges = update-index --assume-unchanged
56 noticechanges = update-index --no-assume-unchanged
57 gcap = gc --aggressive --prune
58 listconf = config --global --list
59 cam = commit -a -m
60 lsm = log -M --stat
61 hse = log --stat -5
62 diffall = diff HEAD
63 logr = log -M
64 logr2 = log --stat -M -2
65 logit = log --stat -M
66 scrub = !git reset --hard && git clean -fd
67 pub = !git pub checkout master && git pull && git checkout dev && git rebase master && git checkout master && git merge dev && git wtf
68 cs = status
69 rv = remote -v
70 lwr = log --stat -C
71 pur = pull --rebase
72 whatis = show -s --pretty='tformat:%h (%s, %ad)' --date=short
73 orphank = !gitk --all `git reflog | cut -c1-7`&
74 orphanl = !git --pretty=oneline --abbrev-commit --graph --decorate `git reflog | cut -c1-7`
75 k = !exec gitk --all&
76 testecho1 = !sh -c 'echo with slash: zero=$0 one=$1 two=$2' -
77 # te1 RESULT: with slash: zero=- one=A two=B
78 testecho2 = !sh -c 'echo without slash: zero=$0 one=$1 two=$2'
79 # te2 RESULT: without slash: zero=A one=B two=C
80 st = status
81 l = log --stat -C
82 ll = log --stat -C -3
76b6431 @matthewmccullough Added some new aliases for pushing and fetching notes. Added some instea...
authored
83 servehere = daemon --verbose --informative-errors --reuseaddr --export-all --base-path=. --enable=receive-pack
84 purgeme = !git clean -fd && git reset --hard
85 prunenow = gc --prune=now
86 fixup = !sh -c 'git commit -m \"fixup! $(git log -1 --format='\\''%s'\\'' $@)\"' -
87 squash = !sh -c 'git commit -m \"squash! $(git log -1 --format='\\''%s'\\'' $@)\"' -
88 ri = rebase --interactive --autosquash
89 ccfq = !sh -c 'git add $1 && git commit -m\"Placeholder\"' -
9a6723d @matthewmccullough Many updates
authored
90 lol = log --pretty=oneline --abbrev-commit
91 sealog = log --graph --decorate --pretty=oneline --abbrev-commit --all
92 logmsp = log --graph --all --decorate --pretty=oneline --abbrev-commit
93 blg = log --graph --decorate --all --abbrev-commit --pretty=oneline
76b6431 @matthewmccullough Added some new aliases for pushing and fetching notes. Added some instea...
authored
94 lgso = log --graph --date=short --pretty=format:'%C(yellow)%h%Creset %cn%x09%cd %s%C(green bold)%d'
95 ro = !git fetch origin && git reset --hard origin/master
96 shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
97 pushnotes = !sh -c 'git push $1 refs/notes/*' -
98 fetchnotes = !sh -c 'git fetch $1 refs/notes/*:refs/notes/*' -
9a6723d @matthewmccullough Many updates
authored
99
1b8a434 @matthewmccullough Separating the global git ignore from the repo-specific one
authored
100 # Other alias ideas that don't quite work yet
101 #testnewrepodoesntwork1 = !echo git init $1 && echo cd $1
102 #testnewrepodoesntwork2 = !sh -c 'git init $1; echo hi' -
103 #testnewrepodoesntwork3 = "!f() { git init $1}; f"
104 #testbashgitinit = "!bash -c 'git init $0'"
105 #testecho = !echo cd $1
106 #testbashfunction = "!function gitme() { git init $1; echo now cd to $1; }; gitme"
9a6723d @matthewmccullough Many updates
authored
107
108
109 [apply]
110 whitespace = nowarn
111 [rerere]
112 enabled = 1
113
114 [diff]
115 tool = araxis
116 [difftool]
117 prompt = false
118 #[difftool "myaraxis"]
76b6431 @matthewmccullough Added some new aliases for pushing and fetching notes. Added some instea...
authored
119 # cmd = araxisgitdiff ONE $LOCAL THREE FOUR $REMOTE
9a6723d @matthewmccullough Many updates
authored
120
121 [merge]
122 tool = araxis
123 [mergetool]
124 prompt = false
125 keepBackup = false
126 #[mergetool "myaraxis"]
76b6431 @matthewmccullough Added some new aliases for pushing and fetching notes. Added some instea...
authored
127 # cmd = araxisgitmerge $PWD/$REMOTE $PWD/$BASE $PWD/$LOCAL $PWD/$MERGED
9a6723d @matthewmccullough Many updates
authored
128
129 [branch]
76b6431 @matthewmccullough Added some new aliases for pushing and fetching notes. Added some instea...
authored
130 # Automatically set up pull to be --rebase
131 # autosetuprebase = always
9a6723d @matthewmccullough Many updates
authored
132
133 [github]
76b6431 @matthewmccullough Added some new aliases for pushing and fetching notes. Added some instea...
authored
134 # https://github.com/blog/180-local-github-config
135 user = matthewmccullough
1b8a434 @matthewmccullough Separating the global git ignore from the repo-specific one
authored
136 token = d3cc4fffdontyouwishitwere719d66d8657
9ac1162 @matthewmccullough Formatting indents, adding logging commands to git configuration
authored
137
76b6431 @matthewmccullough Added some new aliases for pushing and fetching notes. Added some instea...
authored
138 [url "git://github.com/"]
139 insteadOf = "ghg://"
140 pushInsteadOf = "ghg://"
141 # Example: git clone ghg://ntschutta/emacs
142 [url "git://github.com/matthewmccullough/"]
143 insteadOf = "ghgm://"
144 pushInsteadOf = "ghgm://"
145 # Example: git clone ghgm://hellogitworld
146 [url "git@github.com:"]
147 insteadOf = "ghs://"
148 pushInsteadOf = "ghs://"
149 [url "git@github.com:matthewmccullough/"]
150 insteadOf = "ghsm://"
151 pushInsteadOf = "ghsm://"
152 [url "https://github.com/"]
153 insteadOf = "ghh://"
154 pushInsteadOf = "ghh://"
155 [url "https://github.com/matthewmccullough/"]
156 insteadOf = "ghhm://"
157 pushInsteadOf = "ghhm://"
Something went wrong with that request. Please try again.