Repository navigation
Expand file tree
/
Copy pathgitconfig
More file actions
45 lines (45 loc) · 1.55 KB
/
Copy pathgitconfig
File metadata and controls
45 lines (45 loc) · 1.55 KB
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
[user]
name = ohel
email = ohel@users.noreply.github.com
[core]
autocrlf = false
editor = vim
[push]
default = upstream
[pull]
ff = yes
rebase = true
[merge]
ff = no
commit = no
[alias]
amend = commit --amend -C HEAD
branchcleanup = !git fetch -p && git branch -vv | awk '/: gone]/{print $1}' | xargs git branch -d
branchforcecleanup = !git fetch -p && git branch -vv | awk '/: gone]/{print $1}' | xargs git branch -d -f
branchlog = !git log --pretty=short $(git rev-parse --abbrev-ref HEAD)
forcepush = push --force-with-lease
linelog = log --pretty=oneline
lastlog = log -p -1
logs = log --stat
remotedelete = !test X$1 != X && git branch -D $1 && git push origin --delete $1
remotedeletethis = !branchtodelete=$(git rev-parse --abbrev-ref HEAD) && echo "Deleting branch: $branchtodelete" && git checkout master && git branch -D $branchtodelete && git push origin --delete $branchtodelete && unset branchtodelete
remotepush = !git push -u origin $(git rev-parse --abbrev-ref HEAD)
sterilize = !git reflog expire --expire-unreachable=all --all && git gc --prune=all
unstage = restore --staged
visualize = log --graph --oneline --decorate --all
diffc = diff --cached
reversestash = !git stash show -p | git apply --reverse
[color]
ui = auto
[diff]
tool = meld
[difftool]
prompt = false
[difftool "meld"]
cmd = meld "$LOCAL" "$REMOTE"
[merge]
tool = meld
[mergetool "meld"]
cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
[gitreview]
remote = origin