summaryrefslogtreecommitdiff
path: root/git-gui/git-gui.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-15 08:31:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-05-15 08:31:15 (GMT)
commit1fbb58b4153e90eda08c2b022ee32d90729582e6 (patch)
treeab3b850ab1c4f7d46be319133193d7fd7c0d6cb2 /git-gui/git-gui.sh
parent58949bb18a1610d109e64e997c41696e0dfe97c3 (diff)
parent76bb40cde0e15e8d0e8493abb0bd18a5d6386ad7 (diff)
downloadgit-1fbb58b4153e90eda08c2b022ee32d90729582e6.zip
git-1fbb58b4153e90eda08c2b022ee32d90729582e6.tar.gz
git-1fbb58b4153e90eda08c2b022ee32d90729582e6.tar.bz2
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui: git-gui: Delete branches with 'git branch -D' to clear config git-gui: Setup branch.remote,merge for shorthand git-pull git-gui: Update German translation git-gui: Don't use '$$cr master' with aspell earlier than 0.60 git-gui: Report less precise object estimates for database compression
Diffstat (limited to 'git-gui/git-gui.sh')
-rwxr-xr-xgit-gui/git-gui.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index 7c25bb9..9df4971 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -601,6 +601,7 @@ proc apply_config {} {
}
}
+set default_config(branch.autosetupmerge) true
set default_config(merge.diffstat) true
set default_config(merge.summary) false
set default_config(merge.verbosity) 2