diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-11 14:34:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-11 14:34:53 -0700 |
| commit | 4da8cbc234177d6a8cf749d4ef60bd05ec843898 (patch) | |
| tree | a97b17b67a77e6d9f9b7cdf0aa265594db2ddeb4 /merge-index.c | |
| parent | b5b1442ac35706ce1e3daed407dd935f0e9dd796 (diff) | |
| parent | c4e05b1a2290c605e68e6dac5e2a580e6d4080b7 (diff) | |
| download | git-4da8cbc234177d6a8cf749d4ef60bd05ec843898.tar.gz | |
Merge branch 'jc/diff' into next
* jc/diff:
blame and friends: adjust to multiple pathspec change.
git log --full-diff
tree-diff: do not assume we use only one pathspec
Diffstat (limited to 'merge-index.c')
0 files changed, 0 insertions, 0 deletions