-
Notifications
You must be signed in to change notification settings - Fork 2
/
Copy pathgitconfig-shared
36 lines (36 loc) · 1.37 KB
/
gitconfig-shared
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
[rerere]
enabled = 1
[remote "origin"]
push = HEAD
[branch "master"]
merge = refs/heads/master
[alias]
br = branch
ci = commit -a
co = checkout
cob = "!git co -b $1 && git push -u origin"
dwc = diff -w -M --color-words
fix = rebase -i origin/master
recommit = commit --amend --no-edit
new = !sh -c 'git log $1@{1}..$1@{0} "$@"'
recent-branches = --paginate for-each-ref --format='%(committerdate:relative)%09%(refname:short)' --sort='-committerdate' refs/heads
recent-branches-origin = --paginate for-each-ref --format='%(committerdate:relative)%09%(refname:short)' --sort='-committerdate' refs/remotes/origin
re = remote -v
st = status
sup = "submodule foreach 'git co master; git up'"
tree = log --graph --decorate --pretty=oneline --abbrev-commit --all
up = "!git remote update origin -p; git merge --ff-only @{u}"
everything = log --pretty=format: --name-only --diff-filter=A
grep-conflicts = grep '<<<<<<<'
browse = "!hub browse"
find-merge = "!sh -c 'commit=$0 && branch=${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 -s | uniq -f1 -d | sort -n | tail -1 | cut -f2'"
[push]
default = simple
[merge]
defaultToUpstream = true
[color]
ui = true
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true