|
@@ -25,9 +25,11 @@
|
|
|
changed = bold red
|
|
changed = bold red
|
|
|
untracked = bold yellow
|
|
untracked = bold yellow
|
|
|
|
|
|
|
|
|
|
+[merge]
|
|
|
|
|
+ tool = vimdiff
|
|
|
|
|
+
|
|
|
# git.debian.org specifics
|
|
# git.debian.org specifics
|
|
|
[url "git://anonscm.debian.org"]
|
|
[url "git://anonscm.debian.org"]
|
|
|
insteadOf = "git://git.debian.org"
|
|
insteadOf = "git://git.debian.org"
|
|
|
[url "ssh://git.debian.org"]
|
|
[url "ssh://git.debian.org"]
|
|
|
pushInsteadOf = "git://git.debian.org"
|
|
pushInsteadOf = "git://git.debian.org"
|
|
|
-
|
|
|
