diff options
| author |  Paul Mackerras <paulus@dorrigo.(none)> | 2005-07-27 22:16:51 -0500 |
|---|---|---|
| committer |  Paul Mackerras <paulus@samba.org> | 2005-07-27 22:16:51 -0500 |
| commit | 4ef175376341b15f25098f0ef0ae77852bd3dc88 (patch) | |
| tree | b279af54ae3a7989eca0db7cc86d899462b9ca09 | |
| parent | Display the diffs for a merge in a unified fashion. (diff) | |
| download | tgif-4ef175376341b15f25098f0ef0ae77852bd3dc88.tar.xz | |
Import the --topo-order change and fix the writing of ~/.gitk.
| -rwxr-xr-x | gitk | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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 { |