Skip to content

Commit fd68538

Browse files
committed
default rebase
1 parent 1b9740a commit fd68538

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

gitconfig

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
precomposeunicode = true
1010
logAllRefUpdates = true
1111
pager = diff-so-fancy | less --tabs=4 -RFX
12-
autocrlf = input
12+
autocrlf = input
13+
[pull]
14+
rebase = false
1315
[color]
1416
branch = auto
1517
diff = auto
@@ -61,6 +63,8 @@
6163
insteadOf = https://github.com:443/
6264
[url "ssh://[email protected]/"]
6365
insteadOf = https://bitbucket.org/
66+
[url "https://git.paycall.co.il:7990"]
67+
insteadOf = https://git.paycall.co.il/
6468
[help]
6569
autocorrect = 1
6670
[web]
@@ -78,9 +82,9 @@
7882
[transfer]
7983
fsckobjects = true
8084
[fetch]
81-
fsckobjects = false
85+
fsckobjects = false
8286
[receive]
8387
fsckobjects = true
8488

8589
[protocol]
86-
version = 2
90+
version = 2

gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ __pycache__/**
2626
*$py.class
2727
.vscode/**
2828
.ccls-cache/**
29+
coverage.out

0 commit comments

Comments
 (0)