summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2010-05-08 22:21:34 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-05-08 22:30:02 -0700
commit8d6888ec6aee97f8b2b395e7e075dd00d9689c25 (patch)
treed6511d9df9a552d8cb7008fb7931a2ed53b0834d /Documentation/git-merge-tree.txt
parentDocumentation/notes: document format of notes trees (diff)
downloadtgif-8d6888ec6aee97f8b2b395e7e075dd00d9689c25.tar.xz
Documentation/notes: describe content of notes blobs
stripspace/text-based formatting kicks in when specifying the notes content with -m or -F, or when an editor is used to edit the notes. To binary-safely create notes from files, the following construct is required: git notes add -C $(git hash-object -w <file>) <object> Explain this trick (thanks, Johan!) in the manual. Add an ordinary example, too, to keep this esoteric one company. Cc: Johan Herland <johan@herland.net> Cc: Thomas Rast <trast@student.ethz.ch> Cc: Jeff King <peff@peff.net> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions