diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-01-12 23:16:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-01-12 23:16:54 (GMT) |
| commit | 7b9d1b9556b31fe5f661caa1e82856ca876f2a08 (patch) | |
| tree | 6e862974db7482ccc5d4b5ed28b5dc968acc703f | |
| parent | ce7da1d2818e42647e96f882bf9cf40a685a771f (diff) | |
| parent | 38a2559113d62b0f67ed968db9ca82330b702a9c (diff) | |
| download | git-7b9d1b9556b31fe5f661caa1e82856ca876f2a08.zip git-7b9d1b9556b31fe5f661caa1e82856ca876f2a08.tar.gz git-7b9d1b9556b31fe5f661caa1e82856ca876f2a08.tar.bz2 | |
Merge branch 'ps/push-delete-option'
"branch --delete" has "branch -d" but "push --delete" does not.
* ps/push-delete-option:
push: add '-d' as shorthand for '--delete'
push: add '--delete' flag to synopsis
| -rw-r--r-- | Documentation/git-push.txt | 2 | ||||
| -rw-r--r-- | builtin/push.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 4c775bc..32482ce 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>] - [--repo=<repository>] [-f | --force] [--prune] [-v | --verbose] + [--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose] [-u | --set-upstream] [--[no-]signed|--sign=(true|false|if-asked)] [--force-with-lease[=<refname>[:<expect>]]] diff --git a/builtin/push.c b/builtin/push.c index 8963dbd..960ffc3 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -538,7 +538,7 @@ int cmd_push(int argc, const char **argv, const char *prefix) OPT_BIT( 0 , "all", &flags, N_("push all refs"), TRANSPORT_PUSH_ALL), OPT_BIT( 0 , "mirror", &flags, N_("mirror all refs"), (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE)), - OPT_BOOL( 0, "delete", &deleterefs, N_("delete refs")), + OPT_BOOL('d', "delete", &deleterefs, N_("delete refs")), OPT_BOOL( 0 , "tags", &tags, N_("push tags (can't be used with --all or --mirror)")), OPT_BIT('n' , "dry-run", &flags, N_("dry run"), TRANSPORT_PUSH_DRY_RUN), OPT_BIT( 0, "porcelain", &flags, N_("machine-readable output"), TRANSPORT_PUSH_PORCELAIN), |