| commit | 37e9c7f5e15aa423cef640cc4dc137da2f73c5af | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Jul 2016 21:13:45 +0000 (25 14:13 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Jul 2016 21:13:45 +0000 (25 14:13 -0700) | ||
| tree | 93e6584656c5fd138dfffba4261ab16811fa39df | treesnapshot (tar.gz zip) |
| parent | 9db397978416f9d562a94e55db86c7a45210a05c | commitdiff |
| parent | c66b470082144471fc95e669eb398c8f320d67c4 | commitdiff |
Merge branch 'mh/blame-worktree'
"git blame file" allowed the lineage of lines in the uncommitted,
unadded contents of "file" to be inspected, but it refused when
"file" did not appear in the current commit. When "file" was
created by renaming an existing file (but the change has not been
committed), this restriction was unnecessarily tight.
* mh/blame-worktree:
t/t8003-blame-corner-cases.sh: Use here documents
blame: allow to blame paths freshly added to the index
"git blame file" allowed the lineage of lines in the uncommitted,
unadded contents of "file" to be inspected, but it refused when
"file" did not appear in the current commit. When "file" was
created by renaming an existing file (but the change has not been
committed), this restriction was unnecessarily tight.
* mh/blame-worktree:
t/t8003-blame-corner-cases.sh: Use here documents
blame: allow to blame paths freshly added to the index
| builtin/blame.c | diff1 | diff2 | blobhistory |