summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-02-18 11:31:52 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-02-18 11:31:52 -0800
commit25487f8e2ae266936df0f807ae79dca41606e404 (patch)
treedcea5cb274c0618e742644b5cd7b0615202819b7 /Documentation
parentfilter-branch -d: Export GIT_DIR earlier (diff)
parenttests: fix "export var=val" (diff)
downloadtgif-25487f8e2ae266936df0f807ae79dca41606e404.tar.xz
Merge branch 'maint'
* maint: tests: fix "export var=val" Skip timestamp differences for diff --no-index Documentation/git-push: --all, --mirror, --tags can not be combined
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-push.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 7d1eced7d2..ac6421178c 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -9,7 +9,7 @@ git-push - Update remote refs along with associated objects
SYNOPSIS
--------
[verse]
-'git push' [--all | --mirror] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>]
+'git push' [--all | --mirror | --tags] [--dry-run] [--receive-pack=<git-receive-pack>]
[--repo=<repository>] [-f | --force] [-v | --verbose]
[<repository> <refspec>...]