-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
executable file
·63 lines (59 loc) · 1.75 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
[user]
email = [email protected]
name = Shubham Kulkarni
[credential]
[core]
editor = vim
eol = lf
autocrlf = false
[alias]
hist = "!git log | head -n 11"
uncache = "rm --cached"
ls = "ls-files"
s = "status"
a = "add -u"
c = "commit"
amend = "commit --amend"
age = "rev-list --count"
delete = "push --delete"
p = "push origin HEAD"
ff = "merge --ff-only"
lg = "log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset) %C(bold cyan)(committed: %cD)%C(reset) %C(auto)%d%C(reset)%n'' %C(white)%s%C(reset)%n'' %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)'"
edit = "!vim $(git status --porcelain | sed s/^...//)"
# last = "!f(){ \
# val=${1:-1}; \
# vim $(git diff-tree HEAD HEAD~$val -name-only | awk '{ print $NF }'); \
# }; f"
last = "!f(){ \
val=${1:-1}; \
vim $(git diff HEAD~$val..HEAD --name-only); \
}; f"
[diff "jupyternotebook"]
command = git-nbdiffdriver diff
[merge "jupyternotebook"]
driver = git-nbmergedriver merge %O %A %B %L %P
name = jupyter notebook merge driver
[difftool "nbdime"]
cmd = git-nbdifftool diff \"$LOCAL\" \"$REMOTE\" \"$BASE\"
[difftool]
prompt = false
trustExitCode = true
[mergetool "nbdime"]
cmd = git-nbmergetool merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
[mergetool]
prompt = true
trustExitCode = true
keepBackup = false
keepTemporaries = false
[diff]
tool = vimdiff
[merge]
tool = vimdiff
[rerere]
enabled = true
[hub]
protocol = ssh
[init]
defaultBranch = main
[pull]
rebase = false