forked from MikeMcQuaid/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 6
/
gitconfig
197 lines (195 loc) · 7.19 KB
/
gitconfig
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
[include]
path = ~/.gitconfig-user
[color]
# Colour terminal command output when possible.
ui = auto
[gist]
# Open GitHub Gist in browser after submission.
browse = true
[push]
# Push to the set upstream branch being tracked by default.
default = simple
[fetch]
# Always prune when fetching (and pulling).
prune = 1
[rerere]
# Store and re-use manual conflict resolution changes.
enabled = 1
[core]
# Exclude everything this file. Used for general exclusions.
excludesfile = ~/.gitignore
# Set attributes on files. Used for general diff improvements.
attributesfile = ~/.gitattributes
# Don't prompt for commit messages for merge commits.
mergeoptions = --no-edit
[help]
# Autocorrect mistyped commands.
autocorrect = 1
[alias]
## 'New' Commands
# Unstage the changes in a given file.
unstage = reset HEAD --
# View the current changes in the staging area.
staged = diff --cached
# Print the name of the current branch.
current-branch = symbolic-ref --short HEAD
# Print the name of the current upstream tracking branch.
upstream = !git config --get branch.$(git current-branch).remote \
|| echo origin
# Cherry-pick a commit with your signature.
sign = cherry-pick --signoff
# List all current SVN externals for this repository.
svn-externals = !git svn show-externals | grep -x \\"[^#].*\\"
# Create a git:// server of the current repository.
# WARNING: this gives all users read/write access
# without authentication (so only use on trusted networks).
serve = !git daemon --reuseaddr --export-all --base-path=. \
--verbose ./.git
# Merge a branch and commit a merge commit (even if one
# isn't needed)
noff = merge --no-ff
# Merge a branch with a merge commit and resolve any conflicts
# always using that branch's version rather than the current branch.
theirs = !git noff -Xtheirs
# Fetch all branches and rebase the current branch against
# upstream/master.
rebase-against-master = !git fetch --all \
&& git rebase $(git upstream)/master
# Push the current branch upstream to origin using the same branch
# name for the remote branch.
upstream-current-branch = !git push --set-upstream origin \
$(git current-branch)
# Create a pull request on GitHub using the `hub` command.
pull-request = !hub pull-request -o
# Upstream the current branch to origin and create a pull request
# on GitHub.
upstream-and-pull-request = !git upstream-current-branch \
&& git pull-request
# Get the current diff but show differences between characters
# instead of just the differences between lines.
word-diff = diff --word-diff
# Push the current branch and set it as the default upstream branch.
push-and-set-upstream = push --set-upstream
# Create a new branch by checking out another branch.
checkout-as-new-branch = checkout -b
# Rebase against origin/master and prompt for what operations
# should be performed.
interactively-rebase-against-origin-master = \
!git rebase --interactive origin/master
# Show the commit log with a prettier, clearer history.
pretty-one-line-log = log --graph --oneline --decorate
# Commit any changes to files, squash them into the last commit
# and update its date.
fix-up-previous-commit = !git commit --all --amend \
--reuse-message=HEAD --date=\"$(date)\" #"
# Checkout the master branch and update it.
pull-master = !git checkout master && git pull
# Commit a work-in-progress commit (to use with
# fix-up-previous-commit)
work-in-progress = commit -a -m 'WIP'
# Merge a branch with a merge commit and use the more time-consuming
# patience diff algorithm
patience = !git noff -Xpatience
# Hard reset branch to the upstream version.
hard-reset = !git reset --hard $(git upstream)/$(git current-branch)
# Assume the specified file is unchanged to stop changes
# being seen by Git
assume = update-index --assume-unchanged
# No longer assume a specified file remains unchanged
unassume = update-index --no-assume-unchanged
# List all files that are assumed to be unchanged
assumed = !git ls-files -v | grep '^[hsmrck?]' | cut -c 3-
# Delete all non-master branches
delete-merged = !git branch --merged | grep -v 'master' | grep -v '*' | xargs -n 1 git branch -D
# Get the merge-base compared to origin/master
merge-base-master = merge-base origin/master HEAD
# Diff against the current branch's merge-base
diff-merge-base = !git diff $(git merge-base-master)
## Shortened 'New' Commands
fahr = !git fetch --all && git hard-reset
rem = !git rebase-against-master
wip = !git work-in-progress
pr = !git upstream-and-pull-request
up = !git upstream-current-branch
fa = !git fetch --all
pf = !git push --force-with-lease
dm = !git diff-merge-base
mb = !git merge-base-master
w = !git word-diff
u = !git push-and-set-upstream
b = !git checkout-as-new-branch
i = !git interactively-rebase-against-origin-master
# `true` needed as the return status is wrong otherwise.
l = !git pretty-one-line-log || true
f = !git fix-up-previous-commit
## Shortened Existing Commands
p = pull
s = status --short --branch
[instaweb]
# Use the Ruby WEBRick library when creating a `git instaweb`
# HTTP server.
httpd = webrick
[diff]
# Use the OS X graphical three-way merge tool for graphical diffs.
tool = opendiff
# Use the slower but better patience diff algorithm
algorithm = patience
# Use new diff algorithm to make e.g. function diffs look better.
compactionheuristic = true
[diff "xml"]
textconv = xmllint --format --recover
[difftool "opendiff"]
# Set the OS X opendiff command name.
path = opendiff
[merge]
# Use the OS X graphical three-way merge tool for graphical merges.
tool = opendiff
[mergetool]
# Don't prompt before opening the merge tool.
prompt = false
# Don't keep backups of the merge tool inputs.
keepBackup = false
# Don't keep the merge tool temporary input/output files.
keepTemporaries = false
[mergetool "opendiff"]
# Use a script to setup opendiff correctly for Git merges.
path = git-mergetool-opendiff
[apply]
# Cleanup whitespace by default when apply patches.
whitespace = fix
[rebase]
# Run `git stash` if needed before a `git rebase`
autoStash = true
# Auto-add `--autosquash` to `git rebase`
autoSquash = true
[url "git@github.com:"]
# Always use GitHub SSH protocol to push.
# Allows use of git:// for public repositories with push access
pushInsteadOf = git://github.com/
[url "https://github.com/"]
# Use HTTP for GitHub instead of git:// or git@
# Enable this in networks where git:// or git@ are blocked.
#insteadOf = git://github.com/
#insteadOf = git@github.com:
[url "git@github.com:"]
# Use SSH for GitHub instead of https://
# Enable this in networks where https:// has issues.
#insteadOf = https://github.com/
[url "git@gitorious.org:"]
# Always use Gitorious SSH protocol to push.
# Allows use of git:// for public repositories with push access
# (which is often faster).
pushInsteadOf = git://gitorious.org/
[credential]
# Use OS X Keychain to store HTTP passwords.
helper = osxkeychain
[hub]
protocol = https
# Settings for Git LFS
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true
[commit]
# Show the diff as a comment in the commit message template.
verbose = true