diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2008-04-18 00:27:08 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-20 18:16:46 -0700 |
| commit | 9a7ea2b1f3484bb2a4bbd0b538e5a38df0356701 (patch) | |
| tree | cfd3397ba7ac0dfa1ed0bc2dda876fe4aa2c05c8 | |
| parent | e8b404c27e98a8d1b0e123fe80ce19efbdbf73d7 (diff) | |
| download | git-9a7ea2b1f3484bb2a4bbd0b538e5a38df0356701.tar.gz git-9a7ea2b1f3484bb2a4bbd0b538e5a38df0356701.tar.xz | |
git-branch.txt: compare --contains, --merged and --no-merged
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-branch.txt | 21 |
1 files changed, 21 insertions, 0 deletions
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 <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,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 <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>. + +- `--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 ------ |