diff options
author | Junio C Hamano <junkio@cox.net> | 2007-04-08 10:34:45 +0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-04-08 10:36:22 +0400 |
commit | 5838dffdcbe92bbbf50a29067fd9dc871155d76d (patch) | |
tree | 68b9605d63f321b5f1ca422afd55803f046563d6 | |
parent | ee9693e246669f48f6b058a1044cefa973a44c22 (diff) | |
parent | 732bcf942c6e99879349711fd29b5062a704e248 (diff) |
Merge branch 'maint'
* maint:
Prepare for 1.5.1.1
cvsserver: small corrections to asciidoc documentation
-rw-r--r-- | Documentation/RelNotes-1.5.1.1.txt | 46 | ||||
-rw-r--r-- | Documentation/git-cvsserver.txt | 8 |
2 files changed, 50 insertions, 4 deletions
diff --git a/Documentation/RelNotes-1.5.1.1.txt b/Documentation/RelNotes-1.5.1.1.txt new file mode 100644 index 0000000000..b48b4bc3e8 --- /dev/null +++ b/Documentation/RelNotes-1.5.1.1.txt @@ -0,0 +1,46 @@ +GIT v1.5.1.1 Release Notes (draft) +========================== + +Fixes since v1.5.1 +------------------ + +* Documentation updates + + - The --left-right option of rev-list and friends is documented. + + - The documentation for cvsimport has been majorly improved. + +* Bugfixes + + - "git send-email" produced of References header of unbounded length; + fixed this with line-folding. + + - "git archive" to download from remote site should not + require you to be in a git repository, but it incorrectly + did. + + - "git apply" ignored -p<n> for "diff --git" formatted + patches. + + - "git rerere" recorded a conflict that had one side empty + (the other side adds) incorrectly; this made merging in the + other direction fail to use previously recorded resolution. + + - t4200 test was broken where "wc -l" pads its output with + spaces. + + - "git branch -m old new" to rename branch did not work + without a configuration file in ".git/config". + + - The sample hook for notification e-mail was misnamed. + + - gitweb did not show type-changing patch correctly in the + blobdiff view. + +* Performance Tweaks + +-- +exec >/var/tmp/1 +O=v1.5.1-26-ge94a4f6 +echo O=`git describe refs/heads/maint` +git shortlog --no-merges $O..refs/heads/maint diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt index 85d0950cf4..f9e0c77379 100644 --- a/Documentation/git-cvsserver.txt +++ b/Documentation/git-cvsserver.txt @@ -110,12 +110,12 @@ To get a checkout with the Eclipse CVS client: Protocol notes: If you are using anonymous access via pserver, just select that. Those using SSH access should choose the 'ext' protocol, and configure 'ext' access on the Preferences->Team->CVS->ExtConnection pane. Set CVS_SERVER to -'git-cvsserver'. Not that password support is not good when using 'ext', +'git-cvsserver'. Note that password support is not good when using 'ext', you will definitely want to have SSH keys setup. Alternatively, you can just use the non-standard extssh protocol that Eclipse offer. In that case CVS_SERVER is ignored, and you will have to replace -the cvs utility on the server with git-cvsserver or manipulate your .bashrc +the cvs utility on the server with git-cvsserver or manipulate your `.bashrc` so that calling 'cvs' effectively calls git-cvsserver. Clients known to work @@ -134,9 +134,9 @@ checkout, diff, status, update, log, add, remove, commit. Legacy monitoring operations are not supported (edit, watch and related). Exports and tagging (tags and branches) are not supported at this stage. -The server should set the -k mode to binary when relevant, however, +The server should set the '-k' mode to binary when relevant, however, this is not really implemented yet. For now, you can force the server -to set `-kb` for all files by setting the `gitcvs.allbinary` config +to set '-kb' for all files by setting the `gitcvs.allbinary` config variable. In proper GIT tradition, the contents of the files are always respected. No keyword expansion or newline munging is supported. |