diff options
| author | Linus Torvalds <torvalds@osdl.org> | 2006-02-28 15:07:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-01 01:45:50 -0800 |
| commit | 765ac8ec469f110e88376e4fac05d0ed475bcb28 (patch) | |
| tree | 151dd9135fb335aeffc4b0e4406c8c4cf8b27e2c /git-merge-one-file.sh | |
| parent | 70b006b9712b57741ec1320b15aef2f8b1d6a905 (diff) | |
| download | git-765ac8ec469f110e88376e4fac05d0ed475bcb28.tar.gz git-765ac8ec469f110e88376e4fac05d0ed475bcb28.tar.xz | |
Rip out merge-order and make "git log <paths>..." work again.
Well, assuming breaking --merge-order is fine, here's a patch (on top of
the other ones) that makes
git log <filename>
actually work, as far as I can tell.
I didn't add the logic for --before/--after flags, but that should be
pretty trivial, and is independent of this anyway.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions