diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-13 08:07:55 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-12-13 12:37:13 -0800 |
| commit | 47dc4fd5eb4ab8fbe8ea6bb10e35d398da991cea (patch) | |
| tree | c0fcdbfd88ae033016bd49dd82f23db9955028e7 /Documentation/git-archimport.txt | |
| parent | built-in add -p: support multi-file diffs (diff) | |
| download | tgif-47dc4fd5eb4ab8fbe8ea6bb10e35d398da991cea.tar.xz | |
built-in add -p: handle deleted empty files
This addresses the same problem as 24ab81ae4d (add-interactive: handle
deletion of empty files, 2009-10-27), although in a different way: we
not only stick the "deleted file" line into its own pseudo hunk, but
also the entire remainder (if any) of the same diff.
That way, we do not have to play any funny games with regards to
coalescing the diff after the user selected what (possibly pseudo-)hunks
to stage.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-archimport.txt')
0 files changed, 0 insertions, 0 deletions