[PATCH v2 04/15] user-manual: Use git branch --merged
- From
W. Trevor King <wking@tremily.us>
- Date
- Feb 10, 2013, 15:10 UTC
- Message-ID
- <c8abf7a75a59302e6bdc66eee13eb2ec53b26b46.1360508415.git.wking@tremily.us>
- In-Reply-To
- <cover.1360508415.git.wking@tremily.us>
From: "W. Trevor King" <wking@tremily.us>
Use 'git branch --merged origin'. This feature was introduced by 049716b (branch --merged/--no-merged: allow specifying arbitrary commit, 2008-07-08), after the documentation that's being replaced moved into the manual with 9e2163ea (user-manual: move howto/using-topic-branches into manual, 2007-05-13).
Signed-off-by: W. Trevor King <wking@tremily.us> --- Documentation/user-manual.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 53f73c3..a8f792d 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -2267,10 +2267,10 @@ then pulled by Linus, and finally coming back into your local You detect this when the output from: ------------------------------------------------- -$ git log origin..branchname +$ git branch --merged origin ------------------------------------------------- -is empty. At this point the branch can be deleted: +lists the branch. At this point the branch can be deleted: ------------------------------------------------- $ git branch -d branchname
-- 1.8.1.336.g94702dd