Use . "$(git --exec-path)/git-sh-setup" instead of . git-sh-setup
remove renameLimit = 10000, it's really too slow.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
m,merge perform a merge
"
SUBDIRECTORY_OK=t
m,merge perform a merge
"
SUBDIRECTORY_OK=t
+. "$(git --exec-path)/git-sh-setup"
require_work_tree
lbranch=$(git symbolic-ref HEAD | sed -e s~refs/heads/~~)
require_work_tree
lbranch=$(git symbolic-ref HEAD | sed -e s~refs/heads/~~)
untracked = bold yellow
[merge]
verbosity = 1
untracked = bold yellow
[merge]
verbosity = 1
[clean]
requireForce = false
[pack]
[clean]
requireForce = false
[pack]