[PATCH 0/6] git-merge: a few documentation improvements

From: Sergey Organov Sergey Organov (6): git-merge: clarify "usage" by adding "-m " Documentation/git-merge.txt: remove list of options from SYNOPSIS Documentation/git-merge.txt: fix SYNOPSIS of obsolete form to include options Documentation/git-merge.txt: improve short description in

[PATCH 2/6] Documentation/git-merge.txt: remove list of options from SYNOPSIS

From: Sergey Organov This partial list of option is confusing as it lacks a lot of available options. It also clutters the SYNOPSIS making differences between forms of invocation less clear. Signed-off-by: Sergey Organov --- Documentation/git-merge.txt | 5 + 1 file changed, 1 insertion(+)

[PATCH 1/6] git-merge: clarify "usage" by adding "-m "

From: Sergey Organov "-m " is one of essential distinctions between obsolete invocation form and the recent one. Add it to the "usage" returned by 'git merge -h' for more clarity. Signed-off-by: Sergey Organov --- builtin/merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --gi

[PATCH 4/6] Documentation/git-merge.txt: improve short description in NAME

From: Sergey Organov Old description not only raised the question of why the tool is called git-merge rather than git-join, but "join histories" also sounds like very simple operation, something like what "git-merge -s ours" does. Signed-off-by: Sergey Organov --- Documentation/git-merge.txt |

[PATCH 6/6] Documentation/git-merge.txt: get rid of irrelevant references to git-pull

From: Sergey Organov No awareness of git-pull is required to understand git-merge operation, so leave reference to git-pull only where it actually makes sense, in the description of fast-forward merges, and only as clarification of when this merging behaviour is mostly useful. Other references t

[PATCH 5/6] Documentation/git-merge.txt: improve short description in DESCRIPTION

From: Sergey Organov Old description had a few problems: - sounded as if commits have changes - stated that changes are taken since some "divergence point" that was not defined. New description rather uses "common ancestor" and "merge base", definitions of which are easily discoverable in th

[PATCH 3/6] Documentation/git-merge.txt: fix SYNOPSIS of obsolete form to include options

From: Sergey Organov Signed-off-by: Sergey Organov --- 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 90342eb..216d2f4 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/gi

[PATCH] Documentation/git-merge.txt: improve SYNOPSIS

From: Sergey Organov Get rid of outdated explicit list of options. Reflect that the obsolete form: 'git merge' HEAD ... could also have options. Signed-off-by: Sergey Organov --- Documentation/git-merge.txt | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Documenta