X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=gitk;h=96600b60d693f6cb6c60ad4a4c1f54f11a5468c9;hb=4ef175376341b15f25098f0ef0ae77852bd3dc88;hp=61af6390d339b58dc2e56ce7f1577be7ede243ff;hpb=9d2a52eca1b5ea6c7beb351b45aa2aff092bbd6c;p=git.git

diff --git a/gitk b/gitk
index 61af6390..96600b60 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 {