summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorLibravatar Thomas Rast <trast@student.ethz.ch>2009-01-12 15:16:04 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-01-13 00:14:14 -0800
commitbb1dff9def343a7d513eea8f4eaa5fd7d5d3fc5f (patch)
tree531eec51adf581cc5d7b6c255ded360ea19d87e0 /Documentation/git-merge-one-file.txt
parentAdd an expensive test for git-notes (diff)
downloadtgif-bb1dff9def343a7d513eea8f4eaa5fd7d5d3fc5f.tar.xz
notes: fix core.notesRef documentation
The path format was inconsistent with the one used in git-notes.sh: it supposedly split the sha1 in the same 2/38 format that .git/objects uses, but the code uses the full sha1 without a path separator. While at it, also fix a grammatical error. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions