From: "Lars Hjemli" <hjemli@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v3] git-branch: add support for --merged and --no-merged
Date: Fri, 18 Apr 2008 00:59:54 +0200 [thread overview]
Message-ID: <8c5c35580804171559u87f70b6j59d327ca514da714@mail.gmail.com> (raw)
In-Reply-To: <1208463890-2870-1-git-send-email-hjemli@gmail.com>
On Thu, Apr 17, 2008 at 10:24 PM, Lars Hjemli <hjemli@gmail.com> wrote:
> These options filter the output from git branch to only include branches
> whose tip is either merged or not merged into HEAD.
Gaah, I just noticed a slight terminology slip. Could you please apply
this on top of [PATCH v3]?
(hopefully not mangled by gmail...)
---
diff --git a/builtin-branch.c b/builtin-branch.c
index eecbcf2..19c508a 100644
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -237,7 +237,7 @@ static int append_ref(const char *refname
if (mergefilter > -1) {
branch.item = lookup_commit_reference_gently(sha1, 1);
if (!branch.item)
- die("Unable to lookup HEAD of branch %s", refname);
+ die("Unable to lookup tip of branch %s", refname);
if (mergefilter == 0 && has_commit(head_sha1, &branch))
return 0;
if (mergefilter == 1 && !has_commit(head_sha1, &branch))
prev parent reply other threads:[~2008-04-17 23:00 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-17 9:37 [PATCH] git-branch: add support for --merged and --unmerged Lars Hjemli
2008-04-17 11:34 ` [PATCH] bash: support branch's new '--merged' and '--unmerged' options SZEDER Gábor
2008-04-17 18:07 ` [PATCH] git-branch: add support for --merged and --no-merged Lars Hjemli
2008-04-17 19:13 ` [PATCH] git-branch: add support for --merged and --unmerged Junio C Hamano
2008-04-17 20:24 ` [PATCH v3] git-branch: add support for --merged and --no-merged Lars Hjemli
2008-04-17 21:07 ` Junio C Hamano
2008-04-17 22:27 ` [PATCH] git-branch.txt: compare --contains, " Lars Hjemli
2008-04-17 22:59 ` Lars Hjemli [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8c5c35580804171559u87f70b6j59d327ca514da714@mail.gmail.com \
--to=hjemli@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).