summaryrefslogtreecommitdiff
path: root/unpack-trees.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-05 12:35:52 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-05 12:35:52 -0700
commit2c4610393195cc6f35ea79efadbc5c7fd7470891 (patch)
treeb422689e144f11fc7ded37c809607bc8fb3eee96 /unpack-trees.h
parent703f05ad5835cff92b12c29aecf8d724c8c847e2 (diff)
parent1686519a0854ec09ee1cdd6db7f570ea4590dfce (diff)
downloadgit-2c4610393195cc6f35ea79efadbc5c7fd7470891.tar.gz
Merge branch 'mm/rebase-i-exec-edit'
* 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 'unpack-trees.h')
0 files changed, 0 insertions, 0 deletions