diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-10-15 20:46:36 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-10-15 20:46:36 -0700 |
commit | 57ded055c419183e43fd7841c1f9d2e774fa96e3 (patch) | |
tree | 27a85cbd111b7ee0441a050b998259f0291991e0 /Documentation/git-merge-index.txt | |
parent | t1304: fall back to $USER if $LOGNAME is not defined (diff) | |
parent | rebase -i: notice and warn if "exec $cmd" modifies the index or the working tree (diff) | |
download | tgif-57ded055c419183e43fd7841c1f9d2e774fa96e3.tar.xz |
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 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions