summaryrefslogtreecommitdiff
path: root/packfile.c
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2019-12-13 08:07:59 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-12-13 12:37:14 -0800
commit11f2c0dae8f8889b533455d700121d437f4be19f (patch)
treec0b3e13141205d2c1948fa1d1e5f988fa003fd10 /packfile.c
parentbuilt-in add -p: implement the hunk splitting feature (diff)
downloadtgif-11f2c0dae8f8889b533455d700121d437f4be19f.tar.xz
built-in add -p: coalesce hunks after splitting them
This is considered "the right thing to do", according to 933e44d3a0 ("add -p": work-around an old laziness that does not coalesce hunks, 2011-04-06). Note: we cannot simply modify the hunks while merging them; Once we implement hunk editing, we will call `reassemble_patch()` whenever a hunk is edited, therefore we must not modify the hunks (because the user might e.g. hit `K` and change their mind whether to stage the previous hunk). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'packfile.c')
0 files changed, 0 insertions, 0 deletions