summaryrefslogtreecommitdiff
path: root/t/t5515/fetch.br-branches-default-merge
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2008-03-27 03:30:43 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-03-27 13:54:56 -0700
commitb717a627629e6886956af54274d507b9711d49e6 (patch)
tree8cf5348654fe216e1af3287984b91dd28f2bab8b /t/t5515/fetch.br-branches-default-merge
parentUpdate draft release notes for 1.5.5 (diff)
downloadtgif-b717a627629e6886956af54274d507b9711d49e6.tar.xz
add--interactive: ignore mode change in 'p'atch command
When a path is examined in the patch subcommand, any mode changes in the file are given to use in the diff header by git-diff. If no hunks are staged, then we throw out that header and do not touch the path. But if _any_ hunks are staged, we use the header, and the mode is changed together with the contents. Since the 'p'atch command should just be dealing with hunks that are shown to the user, it makes sense to just ignore mode changes entirely. We do squirrel away the mode, though, since the next patch will allow users to select the mode update separately. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5515/fetch.br-branches-default-merge')
0 files changed, 0 insertions, 0 deletions