From 4ef175376341b15f25098f0ef0ae77852bd3dc88 Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@dorrigo.(none)>
Date: Wed, 27 Jul 2005 22:16:51 -0500
Subject: [PATCH] Import the --topo-order change and fix the writing of
 ~/.gitk.

---
 gitk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 {
-- 
2.11.0