-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathgitconfig
More file actions
48 lines (45 loc) · 1.37 KB
/
Copy pathgitconfig
File metadata and controls
48 lines (45 loc) · 1.37 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
46
47
48
[user]
email = git@balani.xyz
name = Edwin Balani
signingkey = D7EE79A3B90CDC22
[commit]
verbose = true
[push]
default = simple
[pull]
ff = only
[core]
autocrlf = input
commitGraph = true
editor = nvim
excludesfile = ~/.gitignore
[gc]
writeCommitGraph = true
[alias]
bl = branchless
hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
out = fire
going = fire
ci = commit -v
co = checkout
st = status -s
up = pull --rebase
# Next three from https://utcc.utoronto.ca/~cks/space/blog/programming/GitAliasesIUse
source = remote get-url origin
ffpull = pull --ff-only
ffmerge = merge --ff-only
tree-of = show --format=tformat:%t --no-patch
longtree-of = show --format=tformat:%T --no-patch
ctree = "!sh -c 'ref=\"${1:-HEAD}\"; shift; git ls-tree \"$(git tree-of \"${ref}\")\" \"$@\"' -"
psup = push --set-upstream origin "$(git branch --show-current)"
# h/t kjetilho:
psmr = psup -o merge_request.create -o "merge_request.target=$(git branch --show-current)"
# https://github.com/paulaltin/git-hires-merge
hrm = hires-merge
[color]
ui = auto
[merge]
conflictstyle = diff3
[include]
path = ~/.gitconfig.local