aboutsummaryrefslogtreecommitdiffstats
path: root/fmt-merge-msg.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-08-22 13:13:20 -0700
committerJunio C Hamano <gitster@pobox.com>2025-08-22 13:13:21 -0700
commit72e4eb56f0a89ed4345ee9f806321cc49b0e7a0d (patch)
tree9c61ce5b082c7312eefae4f9efde3f883b332256 /fmt-merge-msg.c
parentMerge branch 'gh/git-jump-pathname-with-sp' (diff)
parentdiff: --no-index should ignore the worktree (diff)
downloadgit-72e4eb56f0a89ed4345ee9f806321cc49b0e7a0d.tar.gz
git-72e4eb56f0a89ed4345ee9f806321cc49b0e7a0d.zip
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 'fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions