Users have a right to expect that --no-foo is the opposite of --foo and
undoes its effect. Since "--no-merges" means "exclude merges" it is
natural to expect that "--merges" means "include merges", but in fact it
means "merges only". Rename it accordingly.
As a side effect, this makes the option name coincide with the rev->flag
(modulo - -> _).
Signed-off-by: Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/git-rev-list.txt | 2 +-
Documentation/git-stash.txt | 2 +-
Documentation/rev-list-options.txt | 2 +-
contrib/completion/git-completion.bash | 2 +-
revision.c | 2 +-
submodule.c | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index b08dfbc..020e585 100644
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -14,7 +14,7 @@ SYNOPSIS
[ \--max-age=<timestamp> ]
[ \--min-age=<timestamp> ]
[ \--sparse ]
- [ \--merges ]
+ [ \--merges-only ]
[ \--no-merges ]
[ \--first-parent ]
[ \--remove-empty ]
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 79abc38..eccafcb 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -246,7 +246,7 @@ repository, but not reachable any more:
----------------------------------------------------------------
git fsck --unreachable |
grep commit | cut -d\ -f3 |
-xargs git log --merges --no-walk --grep=WIP
+xargs git log --merges-only --no-walk --grep=WIP
----------------------------------------------------------------
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 5c6850f..78ea305 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -70,7 +70,7 @@ endif::git-rev-list[]
Stop when a given path disappears from the tree.
---merges::
+--merges-only::
Print only merge commits.
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index ccdc172..298dddc 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1570,7 +1570,7 @@ _git_ls_tree ()
__git_log_common_options="
--not --all
--branches --tags --remotes
- --first-parent --merges --no-merges
+ --first-parent --merges-only --no-merges
--max-count=
--max-age= --since= --after=
--min-age= --until= --before=
diff --git a/revision.c b/revision.c
index e96c281..bd2fedd 100644
--- a/revision.c
+++ b/revision.c
@@ -1276,7 +1276,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->show_all = 1;
} else if (!strcmp(arg, "--remove-empty")) {
revs->remove_empty_trees = 1;
- } else if (!strcmp(arg, "--merges")) {
+ } else if (!strcmp(arg, "--merges-only")) {
revs->merges_only = 1;
} else if (!strcmp(arg, "--no-merges")) {
revs->no_merges = 1;
diff --git a/submodule.c b/submodule.c
index e9f2b19..6cae159 100644
--- a/submodule.c
+++ b/submodule.c
@@ -423,7 +423,7 @@ static int find_first_merges(struct object_array *result, const char *path,
int contains_another;
char merged_revision[42];
- const char *rev_args[] = { "rev-list", "--merges", "--ancestry-path",
+ const char *rev_args[] = { "rev-list", "--merges-only", "--ancestry-path",
"--all", merged_revision, NULL };
struct rev_info revs;
struct setup_revision_opt rev_opts;
--
1.7.4.1.464.gf81ff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html