From: Junio C Hamano Date: Tue, 1 May 2007 00:16:19 +0000 (-0700) Subject: Merge branch 'maint' X-Git-Tag: v1.5.2-rc1~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/07c785dbb799ce7fa74686e776cd07d69c3ce01e?ds=inline;hp=-c Merge branch 'maint' * maint: GIT v1.5.1.3 send-email documentation: clarify --smtp-server git.7: Mention preformatted html doc location Clarify SubmittingPatches Checklist git-svn: Add 'find-rev' command Fix symlink handling in git-svn, related to PerlIO --- 07c785dbb799ce7fa74686e776cd07d69c3ce01e diff --combined Documentation/SubmittingPatches index 2386f496ee,8cf5093dd9..6a4da2ddd9 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@@ -1,5 -1,7 +1,7 @@@ Checklist (and a short version for the impatient): + Commits: + - make commits of logical units - check for unnecessary whitespace with "git diff --check" before committing @@@ -12,8 -14,14 +14,14 @@@ commit message (or just use the option "-s" when committing) to confirm that you agree to the Developer's Certificate of Origin - - do not PGP sign your patch + + Patch: + - use "git format-patch -M" to create the patch + - send your patch to . If you use + git-send-email(1), please test it first by sending + email to yourself. + - do not PGP sign your patch - do not attach your patch, but read in the mail body, unless you cannot teach your mailer to leave the formatting of the patch alone. @@@ -22,9 -30,6 +30,9 @@@ - provide additional information (which is unsuitable for the commit message) between the "---" and the diffstat - send the patch to the list _and_ the maintainer + - if you change, add, or remove a command line option or + make some other user interface change, the associated + documentation should be updated as well. Long version: diff --combined Documentation/git.txt index c5d02dacde,aa65802c86..b0550b8b1c --- a/Documentation/git.txt +++ b/Documentation/git.txt @@@ -29,6 -29,10 +29,10 @@@ in a coherent way to git enlightenment The COMMAND is either a name of a Git command (see below) or an alias as defined in the configuration file (see gitlink:git-config[1]). + Formatted and hyperlinked version of the latest git + documentation can be viewed at + `http://www.kernel.org/pub/software/scm/git/docs/`. + ifdef::stalenotes[] [NOTE] ============ @@@ -37,11 -41,7 +41,11 @@@ Documentation for older releases are av * link:RelNotes-1.5.1.txt[release notes for 1.5.1] -* link:v1.5.0.7/git.html[documentation for release 1.5.0.7] +* link:v1.5.1.2/git.html[documentation for release 1.5.1.2] + +* link:RelNotes-1.5.1.2.txt[release notes for 1.5.1.2] + +* link:RelNotes-1.5.1.1.txt[release notes for 1.5.1.1] * link:RelNotes-1.5.0.7.txt[release notes for 1.5.0.7] @@@ -345,7 -345,6 +349,7 @@@ git Commit 'GIT_COMMITTER_NAME':: 'GIT_COMMITTER_EMAIL':: 'GIT_COMMITTER_DATE':: +'EMAIL':: see gitlink:git-commit-tree[1] git Diffs