| commit | bd8f677e1c8349b9128490e2a21e0f573d0bea1d | |
| author | Paul Mackerras <paulus@samba.org> | |
| Tue, 23 Oct 2007 12:37:23 +0000 (23 22:37 +1000) | ||
| committer | Paul Mackerras <paulus@samba.org> | |
| Tue, 23 Oct 2007 12:37:23 +0000 (23 22:37 +1000) | ||
| tree | e7fd6bf507e35386c6cb589dde24819aff2187e9 | treesnapshot (tar.gz zip) |
| parent | 94503918e480123d0d4cf03b03153e4d83cdfd4e | commitdiff |
gitk: Fix some bugs with path limiting in the diff display
First, we weren't putting "--" between the ids and the paths in the
git diff-tree/diff-index/diff-files command, so if there was a tag
and a file with the same name, we could get an ambiguity in the
command. This puts the "--" in to make it clear that the paths are
paths.
Secondly, this implements the path limiting for merge diffs as well
as the normal 2-way diffs.
Signed-off-by: Paul Mackerras <paulus@samba.org>
First, we weren't putting "--" between the ids and the paths in the
git diff-tree/diff-index/diff-files command, so if there was a tag
and a file with the same name, we could get an ambiguity in the
command. This puts the "--" in to make it clear that the paths are
paths.
Secondly, this implements the path limiting for merge diffs as well
as the normal 2-way diffs.
Signed-off-by: Paul Mackerras <paulus@samba.org>
| gitk | diffblobblamehistory |