From: Lars Hjemli Date: Thu, 17 Apr 2008 22:27:08 +0000 (+0200) Subject: git-branch.txt: compare --contains, --merged and --no-merged X-Git-Tag: v1.5.6-rc0~95^2~1 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9a7ea2b1f3484bb2a4bbd0b538e5a38df0356701;p=git.git git-branch.txt: compare --contains, --merged and --no-merged Signed-off-by: Lars Hjemli Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 95e9d0d0b..c824d8874 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 :: + 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. + :: The name of the branch to create or delete. The new branch name must pass all checks defined by @@ -177,6 +186,18 @@ 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: + +- `--contains ` is used to find all branches which will need + special attention if were to be rebased or amended, since those + branches contain the specified . + +- `--merged` is used to find all branches which can be safely deleted, + since those branches are fully contained by HEAD. + +- `--no-merged` is used to find branches which are candidates for merging + into HEAD, since those branches are not fully contained by HEAD. Author ------