diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-02-26 23:05:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-26 23:05:45 -0800 |
| commit | d365a432271d2f6384cda9c37fb2fe463bdc2850 (patch) | |
| tree | 56fa405031b5951038d2d0189f4ac84b3801b0cb /builtin | |
| parent | Merge branch 'jc/doc-merge-options' (diff) | |
| parent | push: add '--prune' option (diff) | |
| download | tgif-d365a432271d2f6384cda9c37fb2fe463bdc2850.tar.xz | |
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')
| -rw-r--r-- | builtin/push.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/push.c b/builtin/push.c index 6c373cf28b..d315475f16 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() }; |