diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-08-22 13:13:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-08-22 13:13:21 -0700 |
| commit | 72e4eb56f0a89ed4345ee9f806321cc49b0e7a0d (patch) | |
| tree | 9c61ce5b082c7312eefae4f9efde3f883b332256 /merge-blobs.c | |
| parent | d08436df5f686c0d9419717eaeba16bb4ebb3719 (diff) | |
| parent | e1d3d61a45bfdc5031d2066c0e4505ebd8145777 (diff) | |
Merge branch 'jc/diff-no-index-in-subdir'
"git diff --no-index" run inside a subdirectory under control of a
Git repository operated at the top of the working tree and stripped
the prefix from the output, and oddballs like "-" (stdin) did not
work correctly because of it. Correct the set-up by undoing what
the set-up sequence did to cwd and prefix.
* jc/diff-no-index-in-subdir:
diff: --no-index should ignore the worktree
Diffstat (limited to 'merge-blobs.c')
0 files changed, 0 insertions, 0 deletions