summaryrefslogtreecommitdiff
path: root/builtin/push.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-27 07:05:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-02-27 07:05:45 (GMT)
commitd365a432271d2f6384cda9c37fb2fe463bdc2850 (patch)
tree56fa405031b5951038d2d0189f4ac84b3801b0cb /builtin/push.c
parent5419127d0475a78983696544ca5e672e8ea4075d (diff)
parent6ddba5e241ebe484d53e3573c72386f487e25697 (diff)
downloadgit-d365a432271d2f6384cda9c37fb2fe463bdc2850.zip
git-d365a432271d2f6384cda9c37fb2fe463bdc2850.tar.gz
git-d365a432271d2f6384cda9c37fb2fe463bdc2850.tar.bz2
Merge branch 'fc/push-prune'
* fc/push-prune: push: add '--prune' option remote: refactor code into alloc_delete_ref() remote: reorganize check_pattern_match() remote: use a local variable in match_push_refs() Conflicts: builtin/push.c
Diffstat (limited to 'builtin/push.c')
-rw-r--r--builtin/push.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/push.c b/builtin/push.c
index 6c373cf..d315475 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -261,6 +261,8 @@ int cmd_push(int argc, const char **argv, const char *prefix)
OPT_BIT('u', "set-upstream", &flags, "set upstream for git pull/status",
TRANSPORT_PUSH_SET_UPSTREAM),
OPT_BOOL(0, "progress", &progress, "force progress reporting"),
+ OPT_BIT(0, "prune", &flags, "prune locally removed refs",
+ TRANSPORT_PUSH_PRUNE),
OPT_END()
};