Signed-off-by: Lars Hjemli <hjemli@xxxxxxxxx> --- Junio C Hamano wrote: > You did not answer my question as to how --contains and --merged relate to > each other. Sorry, I deemed it to be rhetorical. > I'll answer it myself (please add a documentation updates, as > this would be confusing). Something like this, maybe? Documentation/git-branch.txt | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 95e9d0d..7e37497 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -120,6 +120,15 @@ OPTIONS --no-track:: Ignore the branch.autosetupmerge configuration variable. +--contains <commit>:: + Only list branches which contain the specified commit. + +--merged:: + Only list branches which are fully contained by HEAD. + +--no-merged:: + Do not list branches which are fully contained by HEAD. + <branchname>:: The name of the branch to create or delete. The new branch name must pass all checks defined by @@ -177,6 +186,15 @@ If you are creating a branch that you want to immediately checkout, it's easier to use the git checkout command with its `-b` option to create a branch and check it out with a single command. +The options `--contains`, `--merged` and `--no-merged` serves three related +but different purposes: +<1> `--contains <commit>` is used to find all branches which will need +special attention if <commit> were to be rebased or amended, since those +branches contain the specified <commit>. +<2> `--merged` is used to find all branches which can be safely deleted, +since those branches are fully contained by HEAD. +<3> `--no-merged` is used to find branches which are candidates for merging +into HEAD, since those branches are not fully contained by HEAD. Author ------ -- 1.5.5.64.gb1a99 -- 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
