forked from NeilMenne/dot-file
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path.gitconfig
More file actions
23 lines (19 loc) · 837 Bytes
/
.gitconfig
File metadata and controls
23 lines (19 loc) · 837 Bytes
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
## include this from ~/.gitconfig
# [include]
# path = code/dot-file/.gitconfig
[core]
whitespace = trailing-space,space-before-tab
[alias]
assume = update-index --assume-unchanged
unassume = update-index --no-assume-unchanged
assumed = "!git ls-files -v | grep ^h | cut -c 3-"
ours = "!f() { git checkout --ours $@ && git add $@;};f"
theirs = "!f() { git checkout --theirs $@ && git add $@;};f"
tags = log --tags --simplify-by-decoration --pretty='format:%ai %d'
fetch-pulls = "!f(){ set -x; git fetch \"$1\" \"+refs/pull/*/head:refs/remotes/$1/pull/*\";};f"
fetch-backups = "!f(){ b=${2:-${GIT_USER:-$USER}}; set -x; git fetch \"$1\" \"+refs/remotes/$b/*:refs/remotes/$1/$b/*\";};f"
branch-clean = "!f(){ set -x; git branch -d \"$1\" && git push origin :\"$1\";};f"
[diff]
renames = copies
[push]
default = simple