summaryrefslogtreecommitdiff
path: root/diff-lib.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-15 20:46:36 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-15 20:46:36 -0700
commit57ded055c419183e43fd7841c1f9d2e774fa96e3 (patch)
tree27a85cbd111b7ee0441a050b998259f0291991e0 /diff-lib.c
parentac2604cf5fb9fcf538289a470ecbe345f7f0c220 (diff)
parent1686519a0854ec09ee1cdd6db7f570ea4590dfce (diff)
downloadgit-57ded055c419183e43fd7841c1f9d2e774fa96e3.tar.gz
Merge branch 'mm/rebase-i-exec-edit' into maint
* mm/rebase-i-exec-edit: rebase -i: notice and warn if "exec $cmd" modifies the index or the working tree rebase -i: clean error message for --continue after failed exec
Diffstat (limited to 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions