summaryrefslogtreecommitdiff
path: root/builtin-branch.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-03-26 00:26:47 -0700
committerJunio C Hamano <gitster@pobox.com>2009-03-26 00:26:47 -0700
commit23fd723c9dfbe9b558c0d9a46696ca93f93bab04 (patch)
tree93a6e9ad79fb71d08ddf7b609d25d7c697dc5c46 /builtin-branch.c
parent2545c089e329d340a9bdec9f725fa737063dd7f6 (diff)
parent76aac715465b7678ca5b834ccbdcb88a3ab8a9f4 (diff)
downloadgit-23fd723c9dfbe9b558c0d9a46696ca93f93bab04.tar.gz
Merge branch 'bc/maint-1.6.1-branch-deleted-was'
* bc/maint-1.6.1-branch-deleted-was: git-branch: display "was sha1" on branch deletion rather than just "sha1" Conflicts: builtin-branch.c
Diffstat (limited to 'builtin-branch.c')
-rw-r--r--builtin-branch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-branch.c b/builtin-branch.c
index 14d4b917e5..07a440eeba 100644
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -171,7 +171,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds)
ret = 1;
} else {
struct strbuf buf = STRBUF_INIT;
- printf("Deleted %sbranch %s (%s).\n", remote,
+ printf("Deleted %sbranch %s (was %s).\n", remote,
bname.buf,
find_unique_abbrev(sha1, DEFAULT_ABBREV));
strbuf_addf(&buf, "branch.%s", bname.buf);