summaryrefslogtreecommitdiff
path: root/git-resolve-script
diff options
context:
space:
mode:
authorJon Seymour <jon.seymour@gmail.com>2005-06-20 02:29:41 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-20 03:13:18 (GMT)
commit5e749e259b39a74b31f6c768588b4e628e3802cb (patch)
tree8e9e7a7562a372ab75f22e02fc35ee696f040314 /git-resolve-script
parent51b1e1713b1ed8e962e994cd0850ea439ad8c3de (diff)
downloadgit-5e749e259b39a74b31f6c768588b4e628e3802cb.zip
git-5e749e259b39a74b31f6c768588b4e628e3802cb.tar.gz
git-5e749e259b39a74b31f6c768588b4e628e3802cb.tar.bz2
[PATCH] Fix for --merge-order, --max-age interaction issue
This patch fixes a problem reported by Paul Mackerras regarding the interaction of the --merge-order and --max-age switches of git-rev-list. This patch applies to the current Linus HEAD. A cleaner fix for the same problem in my current HEAD will follow later. With this change, --merge-order produces the same result as no --merge-order on the linux-2.6 git repository, to wit: $> git-rev-list --max-age=1116330140 bcfff0b471a60df350338bcd727fc9b8a6aa54b2 | wc -l 655 $> git-rev-list --merge-order --max-age=1116330140 bcfff0b471a60df350338bcd727fc9b8a6aa54b2 | wc -l 655 Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'git-resolve-script')
0 files changed, 0 insertions, 0 deletions