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 /Documentation | |
| parent | 36857e0026f5a7855f941a955bf7014408a816dd (diff) | |
| download | git-2deda629c2ab7228790fb7561e66515a9bdcf7b6.tar.gz | |
replace: add a --raw mode for --editjk/replace-edit-raw
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 'Documentation')
| -rw-r--r-- | Documentation/git-replace.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt index 61461b9f33..089dcac047 100644 --- a/Documentation/git-replace.txt +++ b/Documentation/git-replace.txt @@ -73,6 +73,14 @@ OPTIONS newly created object. See linkgit:git-var[1] for details about how the editor will be chosen. +--raw:: + When editing, provide the raw object contents rather than + pretty-printed ones. Currently this only affects trees, which + will be shown in their binary form. This is harder to work with, + but can help when repairing a tree that is so corrupted it + cannot be pretty-printed. Note that you may need to configure + your editor to cleanly read and write binary data. + -l <pattern>:: --list <pattern>:: List replace refs for objects that match the given pattern (or |