aboutsummaryrefslogtreecommitdiffstats
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-03-17 15:02:20 -0700
committerJunio C Hamano <gitster@pobox.com>2020-03-17 15:02:20 -0700
commitf0c344ce578f71aeeee7d40cc01e66f74506ecf9 (patch)
tree9dceeebeff284e4ef6fa942c3b4271d03899a805 /merge-recursive.c
parentc522f061d551c9bb8684a7c3859b2ece4499b56b (diff)
parent849e43cc18a8aef639b92c5df9b66af3eb983b2a (diff)
downloadgit-f0c344ce578f71aeeee7d40cc01e66f74506ecf9.tar.gz
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 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions