blob: 26475ef2c5d04884f643a22639a75a64a97711c0 (
plain)
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
|
[core]
excludesfile = ~/.gitignore
[color]
ui = auto
[include]
path = .custom/gitconfig
[push]
default = matching
[hooks]
global = ~/apps/scripts/misc/git-hooks/contrib/ ~/.git_hooks
[alias]
# Thanks https://stackoverflow.com/questions/3672073/git-merge-to-another-branch
#merge-to = "!f() { git checkout $1 && git merge $2 && git checkout -; }; f"
merge-to = "!f() { export tmp_branch=`git branch | grep '* ' | tr -d '* '`; git checkout $1 && git merge $tmp_branch && git checkout $tmp_branch; unset tmp_branch; }; f"
[tig]
vertical-split = false
[instaweb]
local = true
httpd = webrick
port = 4321
browser = lynx
#browser = chromium
[web]
browser = chromium
# We provide the full path in an attempt to not call firejail twice
[browser "chromium"]
#cmd = ~/apps/utils-x11/chromium-incognito
cmd = /usr/bin/chromium -incognito
[advice]
ignoredHook = false
[pull]
rebase = false
# Default initial branch
# https://stackoverflow.com/questions/64249491/difference-between-main-branch-and-master-branch-in-github
# https://stackoverflow.com/questions/42871542/how-can-i-create-a-git-repository-with-the-default-branch-name-other-than-maste
[init]
defaultBranch = main
|
