author | Junio C Hamano <gitster@pobox.com> | |
Sun, 16 Oct 2011 03:46:36 +0000 (20:46 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 16 Oct 2011 03:46:36 +0000 (20:46 -0700) | ||
commit | 57ded055c419183e43fd7841c1f9d2e774fa96e3 | |
tree | 27a85cbd111b7ee0441a050b998259f0291991e0 | tree | snapshot |
parent | ac2604cf5fb9fcf538289a470ecbe345f7f0c220 | commit | diff |
parent | 1686519a0854ec09ee1cdd6db7f570ea4590dfce | commit | diff |
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
* 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