diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-13 08:07:56 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-12-13 12:37:14 -0800 |
commit | 5906d5de77628e956d708e9a1796c12bee316b59 (patch) | |
tree | 6d3d06672485a688f5b4adadf7740860651608ca /Documentation/git-citool.txt | |
parent | built-in add -p: handle deleted empty files (diff) | |
download | tgif-5906d5de77628e956d708e9a1796c12bee316b59.tar.xz |
built-in app -p: allow selecting a mode change as a "hunk"
This imitates the way the Perl version treats mode changes: it offers
the mode change up for the user to decide, as if it was a diff hunk.
In contrast to the Perl version, we make use of the fact that the mode
line is the first hunk, and explicitly strip out that line from the diff
header if that "hunk" was not selected to be applied, and skipping that
hunk while coalescing the diff. The Perl version plays some kind of diff
line lego instead.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-citool.txt')
0 files changed, 0 insertions, 0 deletions