From: Junio C Hamano Date: Thu, 16 Oct 2014 21:16:42 +0000 (-0700) Subject: Merge branch 'po/everyday-doc' X-Git-Tag: v2.2.0-rc0~45 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1cb3324e6152f3b35a7175b84a82b714290090fa?ds=inline;hp=-c Merge branch 'po/everyday-doc' "git help everyday" to show the Everyday Git document. * po/everyday-doc: doc: add 'everyday' to 'git help' doc: Makefile regularise OBSOLETE_HTML list building doc: modernise everyday.txt wording and format in man page style --- 1cb3324e6152f3b35a7175b84a82b714290090fa diff --combined Documentation/git-push.txt index b17283ab7a,21cd455508..21b3f29c3b --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@@ -10,8 -10,7 +10,8 @@@ SYNOPSI -------- [verse] 'git push' [--all | --mirror | --tags] [--follow-tags] [-n | --dry-run] [--receive-pack=] - [--repo=] [-f | --force] [--prune] [-v | --verbose] [-u | --set-upstream] + [--repo=] [-f | --force] [--prune] [-v | --verbose] + [-u | --set-upstream] [--signed] [--force-with-lease[=[:]]] [--no-verify] [ [...]] @@@ -34,7 -33,7 +34,7 @@@ When the command line does not specify arguments or `--all`, `--mirror`, `--tags` options, the command finds the default `` by consulting `remote.*.push` configuration, and if it is not found, honors `push.default` configuration to decide - what to push (See linkgit:git-config[1] for the meaning of `push.default`). + what to push (See gitlink:git-config[1] for the meaning of `push.default`). OPTIONS[[OPTIONS]] @@@ -130,12 -129,6 +130,12 @@@ already exists on the remote side from the remote but are pointing at commit-ish that are reachable from the refs being pushed. +--signed:: + GPG-sign the push request to update refs on the receiving + side, to allow it to be checked by the hooks and/or be + logged. See linkgit:git-receive-pack[1] for the details + on the receiving end. + --receive-pack=:: --exec=:: Path to the 'git-receive-pack' program on the remote diff --combined Documentation/git.txt index c6175d45e4,6b69cad4f5..9e0a42ce56 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@@ -22,7 -22,7 +22,7 @@@ unusually rich command set that provide and full access to internals. See linkgit:gittutorial[7] to get started, then see - link:everyday.html[Everyday Git] for a useful minimum set of + linkgit:giteveryday[7] for a useful minimum set of commands. The link:user-manual.html[Git User's Manual] has a more in-depth introduction. @@@ -43,10 -43,9 +43,10 @@@ unreleased) version of Git, that is ava branch of the `git.git` repository. Documentation for older releases are available here: -* link:v2.1.1/git.html[documentation for release 2.1.1] +* link:v2.1.2/git.html[documentation for release 2.1.2] * release notes for + link:RelNotes/2.1.2.txt[2.1.2], link:RelNotes/2.1.1.txt[2.1.1], link:RelNotes/2.1.0.txt[2.1]. @@@ -1098,7 -1097,7 +1098,7 @@@ subscribed to the list to send a messag SEE ALSO -------- linkgit:gittutorial[7], linkgit:gittutorial-2[7], - link:everyday.html[Everyday Git], linkgit:gitcvs-migration[7], + linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]