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 /Documentation | |
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 'Documentation')
-rw-r--r-- | Documentation/git-push.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index aede48877f..48760db337 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git push' [--all | --mirror | --tags] [-n | --dry-run] [--receive-pack=<git-receive-pack>] - [--repo=<repository>] [-f | --force] [-v | --verbose] [-u | --set-upstream] + [--repo=<repository>] [-f | --force] [--prune] [-v | --verbose] [-u | --set-upstream] [<repository> [<refspec>...]] DESCRIPTION @@ -71,6 +71,14 @@ nor in any Push line of the corresponding remotes file---see below). Instead of naming each ref to push, specifies that all refs under `refs/heads/` be pushed. +--prune:: + Remove remote branches that don't have a local counterpart. For example + a remote branch `tmp` will be removed if a local branch with the same + name doesn't exist any more. This also respects refspecs, e.g. + `git push --prune remote refs/heads/{asterisk}:refs/tmp/{asterisk}` would + make sure that remote `refs/tmp/foo` will be removed if `refs/heads/foo` + doesn't exist. + --mirror:: Instead of naming each ref to push, specifies that all refs under `refs/` (which includes but is not |