mirror of
https://github.com/git/git
synced 2024-09-20 17:01:35 +00:00
Import the --topo-order change and fix the writing of ~/.gitk.
This commit is contained in:
parent
9d2a52eca1
commit
4ef1753763
5
gitk
5
gitk
|
@ -37,7 +37,7 @@ proc getcommits {rargs} {
|
||||||
set parsed_args $rargs
|
set parsed_args $rargs
|
||||||
}
|
}
|
||||||
if [catch {
|
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] {
|
} err] {
|
||||||
puts stderr "Error executing git-rev-list: $err"
|
puts stderr "Error executing git-rev-list: $err"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -475,7 +475,8 @@ proc click {w} {
|
||||||
|
|
||||||
proc savestuff {w} {
|
proc savestuff {w} {
|
||||||
global canv canv2 canv3 ctext cflist mainfont textfont
|
global canv canv2 canv3 ctext cflist mainfont textfont
|
||||||
global stuffsaved
|
global stuffsaved findmergefiles gaudydiff
|
||||||
|
|
||||||
if {$stuffsaved} return
|
if {$stuffsaved} return
|
||||||
if {![winfo viewable .]} return
|
if {![winfo viewable .]} return
|
||||||
catch {
|
catch {
|
||||||
|
|
Loading…
Reference in a new issue