diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-03-17 15:02:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-17 15:02:20 -0700 |
| commit | f0c344ce578f71aeeee7d40cc01e66f74506ecf9 (patch) | |
| tree | 9dceeebeff284e4ef6fa942c3b4271d03899a805 /Documentation/merge-strategies.txt | |
| parent | Git 2.25.1 (diff) | |
| parent | built-in add -i: accept open-ended ranges again (diff) | |
| download | tgif-f0c344ce578f71aeeee7d40cc01e66f74506ecf9.tar.xz | |
Merge branch 'js/builtin-add-i-cmds' into maint
Minor bugfixes to "git add -i" that has recently been rewritten in C.
* js/builtin-add-i-cmds:
built-in add -i: accept open-ended ranges again
built-in add -i: do not try to `patch`/`diff` an empty list of files
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions