diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-25 12:57:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-25 12:57:48 -0700 |
| commit | 7756b1f1dc07fae9abab4126a687a2609dfbf009 (patch) | |
| tree | 03b62a5fb81bc0e974f2d37829505c683cdf20a6 /Documentation | |
| parent | 1259404c7e5cd88b7f6692986469cd20cbfacdad (diff) | |
| parent | 70da769a4607dbbc4efc490287ead98175cf622b (diff) | |
| download | git-7756b1f1dc07fae9abab4126a687a2609dfbf009.tar.gz | |
Merge branch 'maint'
* maint:
xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines
Update cherry documentation.
Refer to git-rev-parse:Specifying Revisions from git.txt
git-fetch.sh printed protocol fix
RPM package re-classification.
Documentation: note about contrib/.
git-svn: fix symlink-to-file changes when using command-line svn 1.4.0
Set $HOME for selftests
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/SubmittingPatches | 5 | ||||
| -rw-r--r-- | Documentation/git-cherry.txt | 5 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 |
3 files changed, 11 insertions, 2 deletions
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index 90722c21fa..a5b3ebdf72 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@ -101,6 +101,11 @@ send it "To:" the mailing list, and optionally "cc:" him. If it is trivially correct or after the list reached a consensus, send it "To:" the maintainer and optionally "cc:" the list. +Also note that your maintainer does not actively involve himself in +maintaining what are in contrib/ hierarchy. When you send fixes and +enhancements to them, do not forget to "cc: " the person who primarily +worked on that hierarchy in contrib/. + (6) Sign your work diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt index 893baaa6f6..e1bf8ee255 100644 --- a/Documentation/git-cherry.txt +++ b/Documentation/git-cherry.txt @@ -14,8 +14,9 @@ DESCRIPTION The changeset (or "diff") of each commit between the fork-point and <head> is compared against each commit between the fork-point and <upstream>. -Every commit with a changeset that doesn't exist in the other branch -has its id (sha1) reported, prefixed by a symbol. Those existing only +Every commit that doesn't exist in the <upstream> branch +has its id (sha1) reported, prefixed by a symbol. The ones that have +equivalent change already in the <upstream> branch are prefixed with a minus (-) sign, and those that only exist in the <head> branch are prefixed with a plus (+) symbol. diff --git a/Documentation/git.txt b/Documentation/git.txt index 3af6fc63e2..b00607ee1b 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -562,6 +562,9 @@ HEAD:: a valid head 'name' (i.e. the contents of `$GIT_DIR/refs/heads/<head>`). +For a more complete list of ways to spell object names, see +"SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1]. + File/Directory Structure ------------------------ |