{"thread":{"id":"36192","subject":"[PATCH] Documentation/merge-strategies: avoid hyphenated commands","startedAt":"2014-03-16T22:54:56Z","lastAt":"2014-03-16T22:54:56Z","messageCount":1,"participants":["Ramkumar Ramachandra"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"236845","messageId":"1395010496-20383-1-git-send-email-artagnon@gmail.com","threadId":"36192","inReplyTo":null,"subject":"[PATCH] Documentation/merge-strategies: avoid hyphenated commands","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2014-03-16T22:54:56Z","receivedAt":"2014-03-16T22:54:56Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Replace git-pull and git-merge with the corresponding un-hyphenated\nversions. While at it, use ` to mark it up instead of '.\n\nSigned-off-by: Ramkumar Ramachandra <artagnon@gmail.com>\n---\n Documentation/merge-strategies.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt\nindex 12133b9..19f3a5d 100644\n--- a/Documentation/merge-strategies.txt\n+++ b/Documentation/merge-strategies.txt\n@@ -1,10 +1,10 @@\n MERGE STRATEGIES\n ----------------\n \n-The merge mechanism ('git-merge' and 'git-pull' commands) allows the\n+The merge mechanism (`git merge` and `git pull` commands) allows the\n backend 'merge strategies' to be chosen with `-s` option.  Some strategies\n can also take their own options, which can be passed by giving `-X<option>`\n-arguments to 'git-merge' and/or 'git-pull'.\n+arguments to `git merge` and/or `git pull`.\n \n resolve::\n \tThis can only resolve two heads (i.e. the current branch\n-- \n1.9.0.431.g014438b\n"}]}