diff options
author | Jeff King <peff@peff.net> | 2014-06-24 05:46:31 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-06-25 15:28:28 -0700 |
commit | 2deda629c2ab7228790fb7561e66515a9bdcf7b6 (patch) | |
tree | 9b961e2d8daa2487c5fcdacc6fe20e763f8e414c /mergetools/meld | |
parent | replace: use argv_array in export_object (diff) | |
download | tgif-2deda629c2ab7228790fb7561e66515a9bdcf7b6.tar.xz |
replace: add a --raw mode for --edit
One of the purposes of "git replace --edit" is to help a
user repair objects which are malformed or corrupted.
Usually we pretty-print trees with "ls-tree", which is much
easier to work with than the raw binary data. However, some
forms of corruption break the tree-walker, in which case our
pretty-printing fails, rendering "--edit" useless for the
user.
This patch introduces a "--raw" option, which lets you edit
the binary data in these instances.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/meld')
0 files changed, 0 insertions, 0 deletions