summaryrefslogtreecommitdiff
path: root/Documentation
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 /Documentation
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 'Documentation')
-rw-r--r--Documentation/git-push.txt10
1 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index aede488..48760db 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