summaryrefslogtreecommitdiff
path: root/gitk
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-06 23:55:53 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-06 23:55:53 (GMT)
commit889adfe31477455b57a17e15436095e744c3f1e7 (patch)
tree1a56d887c5e0e8e49adf15f8e0f519e2be513584 /gitk
parent960cea2dd108b425fdc4470b48f5eb02963a9be9 (diff)
downloadgit-889adfe31477455b57a17e15436095e744c3f1e7.zip
git-889adfe31477455b57a17e15436095e744c3f1e7.tar.gz
git-889adfe31477455b57a17e15436095e744c3f1e7.tar.bz2
Make gitk use --topo-order instead of --merge-order
It's cheaper to calculate, and doesn't give different results depending on the order of the arguments passed in (and is thus more appropriate for something like gitk that can validly take the unordered "--all" flag to show all branches). The previous dup fix seems to have fixed --topo-order. Holler if you still see problems.
Diffstat (limited to 'gitk')
-rwxr-xr-xgitk2
1 files changed, 1 insertions, 1 deletions
diff --git a/gitk b/gitk
index f969c14..fa222df 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