[PATCH v2] doc: update the order of the syntax `git merge --continue`

2018-06-13 Thread Meng-Sung Wu
The syntax "git merge HEAD " has been removed. The order of the syntax should also be updated. Signed-off-by: Meng-Sung Wu --- Documentation/git-merge.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge

[PATCH] doc: update the order of the syntax `git merge --continue`

2018-06-12 Thread Meng-Sung Wu
The syntax "git merge HEAD " has been removed. The order of the syntax should also be updated. --- Documentation/git-merge.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index d5dfd8430..6a5c00e2c 100644 ---