From: Paul Mackerras Date: Thu, 28 Jul 2005 03:16:51 +0000 (-0500) Subject: Import the --topo-order change and fix the writing of ~/.gitk. X-Git-Tag: v0.99.3~17^2~3 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4ef175376341b15f25098f0ef0ae77852bd3dc88;p=git.git Import the --topo-order change and fix the writing of ~/.gitk. --- diff --git a/gitk b/gitk index 61af6390d..96600b60d 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 {