summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@dorrigo.(none)>2005-07-28 03:16:51 (GMT)
committerPaul Mackerras <paulus@samba.org>2005-07-28 03:16:51 (GMT)
commit4ef175376341b15f25098f0ef0ae77852bd3dc88 (patch)
treeb279af54ae3a7989eca0db7cc86d899462b9ca09
parent9d2a52eca1b5ea6c7beb351b45aa2aff092bbd6c (diff)
downloadgit-4ef175376341b15f25098f0ef0ae77852bd3dc88.zip
git-4ef175376341b15f25098f0ef0ae77852bd3dc88.tar.gz
git-4ef175376341b15f25098f0ef0ae77852bd3dc88.tar.bz2
Import the --topo-order change and fix the writing of ~/.gitk.
-rwxr-xr-xgitk5
1 files changed, 3 insertions, 2 deletions
diff --git a/gitk b/gitk
index 61af639..96600b6 100755
--- a/gitk
+++ b/gitk
@@ -37,7 +37,7 @@ proc getcommits {rargs} {
set parsed_args $rargs
}
if [catch {
- set commfd [open "|git-rev-list --header --merge-order $parsed_args" r]
+ set commfd [open "|git-rev-list --header --topo-order $parsed_args" r]
} err] {
puts stderr "Error executing git-rev-list: $err"
exit 1
@@ -475,7 +475,8 @@ proc click {w} {
proc savestuff {w} {
global canv canv2 canv3 ctext cflist mainfont textfont
- global stuffsaved
+ global stuffsaved findmergefiles gaudydiff
+
if {$stuffsaved} return
if {![winfo viewable .]} return
catch {