diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-07-16 11:25:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-16 11:25:55 -0700 |
| commit | 5418212191b209e2aa881bbb678b8562e89d9066 (patch) | |
| tree | a5884116236e3f023d848023c57ed42e9127c482 /Documentation | |
| parent | Merge branch 'cc/replace-edit' (diff) | |
| parent | replace: add a --raw mode for --edit (diff) | |
| download | tgif-5418212191b209e2aa881bbb678b8562e89d9066.tar.xz | |
Merge branch 'jk/replace-edit-raw'
Teach "git replace --edit" mode a "--raw" option to allow
editing the bare-metal representation data of objects.
* jk/replace-edit-raw:
replace: add a --raw mode for --edit
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 |