summaryrefslogtreecommitdiff
path: root/test-sha1.c
diff options
context:
space:
mode:
authorLibravatar Ramkumar Ramachandra <artagnon@gmail.com>2014-03-16 18:54:56 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-17 15:13:46 -0700
commit3c3e6f5645c5e661bc8c338e4e7a9252a14e429e (patch)
treedcabd7b823e70f7564e7309ee9a5cb4934ac7c7a /test-sha1.c
parentGit 1.8.5.5 (diff)
downloadtgif-3c3e6f5645c5e661bc8c338e4e7a9252a14e429e.tar.xz
Documentation/merge-strategies: avoid hyphenated commands
Replace git-pull and git-merge with the corresponding un-hyphenated versions. While at it, use ` to mark it up instead of '. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'test-sha1.c')
0 files changed, 0 insertions, 0 deletions