* Re: Importing Mozilla CVS into git
From: Linus Torvalds @ 2006-06-03 23:47 UTC (permalink / raw)
To: Robin Rosenberg (list subscriber)
Cc: Martin Langhoff, Jon Smirl, Keith Packard, git
In-Reply-To: <200606040116.38036.robin.rosenberg.lists@dewire.com>
On Sun, 4 Jun 2006, Robin Rosenberg (list subscriber) wrote:
>
> (Yet) Another problem is that many windows tools use CR LF as the line ending.
> Almost all windows editors default to CRLF and some detect existing line
> endings. No editing with notepad anymore. Of course that is a problem
> regardless of whether a git or cvs client is used. You'll get these big
> everything-changed commits that alter between CRLF and LF.
The only sane approach there (if you want to be at all cross-platform) is
to just force everybody to _commit_ in UNIX '\n'-only format. Especially
as most Windows tools probably handle that fine on reading (just have
trouble writing them).
And that shouldn't actually be that hard to do. The most trivial approach
is to have just a pre-trigger on commits, but let's face it, that would
not be a good "full" solution. A better one is to just make the whole
"git update-index" thing just have a "automatically ignore CR/LF" mode.
Which really shouldn't be that hard. I think it's literally a matter of
teaching "index_fd()" in sha1_file.c to recognize text-files, and remove
CR/LF from them. All done (except to add the flag that enables the
detection, of course - just so that sane systems won't have the overhead
or the "corrupt binary files" issue).
Something like this is TOTALLY UNTESTED!
(You also need to teach "diff" to ignore differences in cr/lf, and this
patch is bad because it's unconditional, and probably doesn't work
anyway, but hey, the idea is possibly sound. Maybe)
Linus
---
diff --git a/sha1_file.c b/sha1_file.c
index aea0f40..6dc6a3f 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1740,9 +1740,30 @@ int index_pipe(unsigned char *sha1, int
return ret;
}
+static unsigned long autodetect_crlf(unsigned char *src, unsigned long size)
+{
+ unsigned long newsize = 0;
+ unsigned char *dst = src;
+ unsigned char last = 0;
+
+ while (size) {
+ unsigned char c = *src++;
+ if (last == '\r' && c == '\n') {
+ dst[-1] = '\n';
+ } else {
+ newsize++;
+ dst++;
+ if (dst != src)
+ dst[-1] = c;
+ }
+ last = c;
+ }
+ return newsize;
+}
+
int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, const char *type)
{
- unsigned long size = st->st_size;
+ unsigned long size = st->st_size, use_size;
void *buf;
int ret;
unsigned char hdr[50];
@@ -1755,12 +1776,15 @@ int index_fd(unsigned char *sha1, int fd
if (buf == MAP_FAILED)
return -1;
- if (!type)
+ use_size = size;
+ if (!type) {
type = blob_type;
+ use_size = autodetect_crlf(buf, size);
+ }
if (write_object)
- ret = write_sha1_file(buf, size, type, sha1);
+ ret = write_sha1_file(buf, use_size, type, sha1);
else {
- write_sha1_file_prepare(buf, size, type, sha1, hdr, &hdrlen);
+ write_sha1_file_prepare(buf, use_size, type, sha1, hdr, &hdrlen);
ret = 0;
}
if (size)
^ permalink raw reply related
* Re: Importing Mozilla CVS into git
From: Robin Rosenberg (list subscriber) @ 2006-06-03 23:16 UTC (permalink / raw)
To: Martin Langhoff; +Cc: Jon Smirl, Keith Packard, git
In-Reply-To: <46a038f90606012116t478edacex72a441544f395af4@mail.gmail.com>
fredag 02 juni 2006 06:16 skrev Martin Langhoff:
> On 6/2/06, Jon Smirl <jonsmirl@gmail.com> wrote:
> > It is going to have to be native Windows to move some of the
> > developers over. They are true blue MS types that won't touch anything
> > close to Unix so cygwin is out.
That could be fixed with nice packaging since many CVS users in Windows
never use a command line anyway since TortoiseCVS is so nice.
> As others have pointed out, you have git-cvsserver which emulates a
> CVS server on top of GIT, so it can be used with (almost any) CVS
> client. They will be 2nd class citizens however...
(Yet) Another problem is that many windows tools use CR LF as the line ending.
Almost all windows editors default to CRLF and some detect existing line
endings. No editing with notepad anymore. Of course that is a problem
regardless of whether a git or cvs client is used. You'll get these big
everything-changed commits that alter between CRLF and LF.
-- robin
^ permalink raw reply
* Re: [PATCH] Cleanup git-send-email.perl:extract_valid_email
From: Eric Wong @ 2006-06-03 22:49 UTC (permalink / raw)
To: Horst H. von Brand; +Cc: git, Junio C Hamano, Ryan Anderson
In-Reply-To: <11493547080-git-send-email-vonbrand@inf.utfsm.cl>
"Horst H. von Brand" <vonbrand@inf.utfsm.cl> wrote:
> - Fix the regular expressions for local addresses
> - Fix the fallback regexp for non-local addresses, simplify the logic
>
> Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
> ---
> git-send-email.perl | 9 +++------
> 1 files changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/git-send-email.perl b/git-send-email.perl
> index ed1d89b..a7a7797 100755
> --- a/git-send-email.perl
> +++ b/git-send-email.perl
> @@ -314,18 +314,15 @@ sub extract_valid_address {
> my $address = shift;
>
> # check for a local address:
> - return $address if ($address =~ /^([\w\-]+)$/);
> + return $address if ($address =~ /^([\w\-.]+)$/);
I keep forgetting this, '+' is a valid (and useful) setup, too.
>
> if ($have_email_valid) {
> return Email::Valid->address($address);
> } else {
> # less robust/correct than the monster regexp in Email::Valid,
> # but still does a 99% job, and one less dependency
> - my $cleaned_address;
> - if ($address =~ /([^\"<>\s]+@[^<>\s]+)/) {
> - $cleaned_address = $1;
> - }
> - return $cleaned_address;
> + $address =~ /([\w\-.]+@[\w\-.]+)/;
> + return $1;
Actually, I'm retracting my earlier ack on this. This is way too
restrictive. I'd rather allow an occasional invalid email address than
to reject valid ones. I generally trust git users to know what they're
doing when entering email addresses[1].
*, $, ^, +, = are all valid characters in the username portion (not sure
about local accounts, though), and I'm sure there are more that I don't
know about.
[1] - of course, without address book support in git-send-email, I think
I would've left the 'k' out of Junio's email address by now. Of course
there's also the issue of where I work and having several people using
variations of rob/robert in their email address. I'm likely to make
errors like these far more than entering addresses that email systems
consider invalid, and I suspect I'm not the only one.
--
Eric Wong
^ permalink raw reply
* Re: [PATCH 0/27] Documentation: Spelling fixes
From: Jakub Narebski @ 2006-06-03 20:52 UTC (permalink / raw)
To: git
In-Reply-To: <33723.2579863214$1149366476@news.gmane.org>
Horst.H.von.Brand@inf.utfsm.cl wrote:
> From: Horst H. von Brand <vonbrand@inf.utfsm.cl>
>
> Result of a run of aspell(1) over the *.txt files in Documentation. Also
> fixed several other typoes.
Some of them (behavior vs. behaviour) are just the difference between
American nad British English. And couldn't do that all in _one_ patch?
--
Jakub Narebski
Warsaw, Poland
^ permalink raw reply
* [PATCH 24/27] Documentation: Spelling fixes
From: Horst.H.von.Brand @ 2006-06-03 20:27 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Horst H. von Brand
In-Reply-To: <11493665101874-git-send-email->
From: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
---
Documentation/git-update-index.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index d043e86..3ae6e74 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -40,7 +40,7 @@ OPTIONS
--remove::
If a specified file is in the index but is missing then it's
removed.
- Default behaviour is to ignore removed file.
+ Default behavior is to ignore removed file.
--refresh::
Looks at the current index and checks to see if merges or
--
1.3.3.g86f7
^ permalink raw reply related
* [PATCH 27/27] Documentation: Spelling fixes
From: Horst.H.von.Brand @ 2006-06-03 20:27 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Horst H. von Brand
In-Reply-To: <11493665173464-git-send-email->
From: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
---
Documentation/tutorial.txt | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
index 039a859..db56312 100644
--- a/Documentation/tutorial.txt
+++ b/Documentation/tutorial.txt
@@ -194,7 +194,7 @@ Bob begins with:
This creates a new directory "myrepo" containing a clone of Alice's
repository. The clone is on an equal footing with the original
-project, posessing its own copy of the original project's history.
+project, possessing its own copy of the original project's history.
Bob then makes some changes and commits them:
@@ -240,7 +240,7 @@ of Bob's line of development without doi
shows a list of all the changes that Bob made since he branched from
Alice's master branch.
-After examing those changes, and possibly fixing things, Alice can
+After examining those changes, and possibly fixing things, Alice can
pull the changes into her master branch:
-------------------------------------
@@ -374,7 +374,7 @@ project, so
$ git grep "hello" v2.5
-------------------------------------
-searches for all occurences of "hello" in v2.5.
+searches for all occurrences of "hello" in v2.5.
If you leave out the commit name, git grep will search any of the
files it manages in your current directory. So
@@ -482,6 +482,6 @@ digressions that may be interesting at t
smart enough to perform a close-to-optimal search even in the
case of complex non-linear history with lots of merged branches.
- * link:everyday.html[Everday GIT with 20 Commands Or So]
+ * link:everyday.html[Everyday GIT with 20 Commands Or So]
* link:cvs-migration.html[git for CVS users].
--
1.3.3.g86f7
^ permalink raw reply related
* [PATCH 26/27] Documentation: Spelling fixes
From: Horst.H.von.Brand @ 2006-06-03 20:27 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Horst H. von Brand
In-Reply-To: <1149366517875-git-send-email->
From: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
---
Documentation/tutorial-2.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/tutorial-2.txt b/Documentation/tutorial-2.txt
index 9c9500c..82c6922 100644
--- a/Documentation/tutorial-2.txt
+++ b/Documentation/tutorial-2.txt
@@ -49,7 +49,7 @@ tree
A tree can refer to one or more "blob" objects, each corresponding to
a file. In addition, a tree can also refer to other tree objects,
-thus creating a directory heirarchy. You can examine the contents of
+thus creating a directory hierarchy. You can examine the contents of
any tree using ls-tree (remember that a long enough initial portion
of the SHA1 will also work):
--
1.3.3.g86f7
^ permalink raw reply related
* [PATCH 22/27] Documentation: Spelling fixes
From: Horst.H.von.Brand @ 2006-06-03 20:27 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Horst H. von Brand
In-Reply-To: <11493665032900-git-send-email->
From: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
---
Documentation/git-sh-setup.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-sh-setup.txt b/Documentation/git-sh-setup.txt
index 6742c9b..79217d8 100644
--- a/Documentation/git-sh-setup.txt
+++ b/Documentation/git-sh-setup.txt
@@ -13,7 +13,7 @@ DESCRIPTION
-----------
Sets up the normal git environment variables and a few helper functions
-(currently just "die()"), and returns ok if it all looks like a git archive.
+(currently just "die()"), and returns OK if it all looks like a git archive.
So, to make the rest of the git scripts more careful and readable,
use it as follows:
--
1.3.3.g86f7
^ permalink raw reply related
* [PATCH 25/27] Documentation: Spelling fixes
From: Horst.H.von.Brand @ 2006-06-03 20:27 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Horst H. von Brand
In-Reply-To: <11493665112903-git-send-email->
From: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
---
Documentation/hooks.txt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/hooks.txt b/Documentation/hooks.txt
index 3824a95..e853b93 100644
--- a/Documentation/hooks.txt
+++ b/Documentation/hooks.txt
@@ -100,7 +100,7 @@ update
This hook is invoked by `git-receive-pack` on the remote repository,
which is happens when a `git push` is done on a local repository.
Just before updating the ref on the remote repository, the update hook
-is invoked. It's exit status determins the success or failure of
+is invoked. It's exit status determines the success or failure of
the ref update.
The hook executes once for each ref to be updated, and takes
@@ -151,7 +151,7 @@ so it is a poor place to do log old..new
The default post-update hook, when enabled, runs
`git-update-server-info` to keep the information used by dumb
-transports (eg, http) up-to-date. If you are publishing
+transports (e.g.,, http) up-to-date. If you are publishing
a git repository that is accessible via http, you should
probably enable this hook.
--
1.3.3.g86f7
^ permalink raw reply related
* [PATCH 19/27] Documentation: Spelling fixes
From: Horst.H.von.Brand @ 2006-06-03 20:27 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Horst H. von Brand
In-Reply-To: <11493664912139-git-send-email->
From: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
---
Documentation/git-rev-parse.txt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index ab896fc..c4b0ff5 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -13,7 +13,7 @@ SYNOPSIS
DESCRIPTION
-----------
-Many git Porcelainish commands take mixture of flags
+Many git porcelainish commands take mixture of flags
(i.e. parameters that begin with a dash '-') and parameters
meant for underlying `git-rev-list` command they use internally
and flags and parameters for other commands they use as the
@@ -91,7 +91,7 @@ OPTIONS
--short, --short=number::
Instead of outputting the full SHA1 values of object names try to
- abbriviate them to a shorter unique name. When no length is specified
+ abbreviate them to a shorter unique name. When no length is specified
7 is used. The minimum length is 4.
--since=datestring, --after=datestring::
--
1.3.3.g86f7
^ permalink raw reply related
* [PATCH 21/27] Documentation: Spelling fixes
From: Horst.H.von.Brand @ 2006-06-03 20:27 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Horst H. von Brand
In-Reply-To: <11493664980-git-send-email->
From: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
---
Documentation/git-send-pack.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt
index 08e0705..9e67f17 100644
--- a/Documentation/git-send-pack.txt
+++ b/Documentation/git-send-pack.txt
@@ -53,7 +53,7 @@ Specifying the Refs
There are three ways to specify which refs to update on the
remote end.
-With '--all' flag, all refs that exist locally are transfered to
+With '--all' flag, all refs that exist locally are transferred to
the remote side. You cannot specify any '<ref>' if you use
this flag.
--
1.3.3.g86f7
^ permalink raw reply related
* [PATCH 23/27] Documentation: Spelling fixes
From: Horst.H.von.Brand @ 2006-06-03 20:27 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Horst H. von Brand
In-Reply-To: <11493665092334-git-send-email->
From: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
---
Documentation/git-tools.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-tools.txt b/Documentation/git-tools.txt
index 00e57a6..d79523f 100644
--- a/Documentation/git-tools.txt
+++ b/Documentation/git-tools.txt
@@ -12,7 +12,7 @@ This document presents a brief summary o
link.
-Alternative/Augmentative Procelains
+Alternative/Augmentative Porcelains
-----------------------------------
- *Cogito* (http://www.kernel.org/pub/software/scm/cogito/)
--
1.3.3.g86f7
^ permalink raw reply related
* [PATCH 18/27] Documentation: Spelling fixes
From: Horst.H.von.Brand @ 2006-06-03 20:27 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Horst H. von Brand
In-Reply-To: <11493664902219-git-send-email->
From: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
---
Documentation/git-reset.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index b27399d..3a581ad 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -24,7 +24,7 @@ gitlink:git-revert[1] is your friend.
OPTIONS
-------
--mixed::
- Resets the index but not the working tree (ie, the changed files
+ Resets the index but not the working tree (i.e.,, the changed files
are preserved but not marked for commit) and reports what has not
been updated. This is the default action.
--
1.3.3.g86f7
^ permalink raw reply related
* [PATCH 20/27] Documentation: Spelling fixes
From: Horst.H.von.Brand @ 2006-06-03 20:27 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Horst H. von Brand
In-Reply-To: <1149366497156-git-send-email->
From: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
---
Documentation/git-send-email.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 8c58685..ad1b9cf 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -52,7 +52,7 @@ The options available are:
is not set, this will be prompted for.
--no-signed-off-by-cc::
- Do not add emails foudn in Signed-off-by: lines to the cc list.
+ Do not add emails found in Signed-off-by: lines to the cc list.
--quiet::
Make git-send-email less verbose. One line per email should be
--
1.3.3.g86f7
^ permalink raw reply related
* [PATCH 15/27] Documentation: Spelling fixes
From: Horst.H.von.Brand @ 2006-06-03 20:27 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Horst H. von Brand
In-Reply-To: <11493664781775-git-send-email->
From: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
---
Documentation/git-patch-id.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-patch-id.txt b/Documentation/git-patch-id.txt
index 723b8cc..5389097 100644
--- a/Documentation/git-patch-id.txt
+++ b/Documentation/git-patch-id.txt
@@ -13,7 +13,7 @@ DESCRIPTION
-----------
A "patch ID" is nothing but a SHA1 of the diff associated with a patch, with
whitespace and line numbers ignored. As such, it's "reasonably stable", but at
-the same time also reasonably unique, ie two patches that have the same "patch
+the same time also reasonably unique, i.e., two patches that have the same "patch
ID" are almost guaranteed to be the same thing.
IOW, you can use this thing to look for likely duplicate commits.
--
1.3.3.g86f7
^ permalink raw reply related
* [PATCH 13/27] Documentation: Spelling fixes
From: Horst.H.von.Brand @ 2006-06-03 20:27 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Horst H. von Brand
In-Reply-To: <11493664763628-git-send-email->
From: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
---
Documentation/git-grep.txt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 74102b7..7b810df 100644
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -30,7 +30,7 @@ OPTIONS
-------
--cached::
Instead of searching in the working tree files, check
- the blobs registerd in the index file.
+ the blobs registered in the index file.
-a | --text::
Process binary files as if they were text.
@@ -65,7 +65,7 @@ OPTIONS
-[ABC] <context>::
Show `context` trailing (`A` -- after), or leading (`B`
-- before), or both (`C` -- context) lines, and place a
- line containing `--` between continguous groups of
+ line containing `--` between contiguous groups of
matches.
-f <file>::
--
1.3.3.g86f7
^ permalink raw reply related
* [PATCH 10/27] Documentation: Spelling fixes
From: Horst.H.von.Brand @ 2006-06-03 20:27 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Horst H. von Brand
In-Reply-To: <11493664672829-git-send-email->
From: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
---
Documentation/git-diff-tree.txt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index 906830d..f7e8ff2 100644
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -32,7 +32,7 @@ include::diff-options.txt[]
<path>...::
If provided, the results are limited to a subset of files
matching one of these prefix strings.
- ie file matches `/^<pattern1>|<pattern2>|.../`
+ i.e., file matches `/^<pattern1>|<pattern2>|.../`
Note that this parameter does not provide any wildcard or regexp
features.
@@ -54,7 +54,7 @@ include::diff-options.txt[]
+
When a single commit is given on one line of such input, it compares
the commit with its parents. The following flags further affects its
-behaviour. This does not apply to the case where two <tree-ish>
+behavior. This does not apply to the case where two <tree-ish>
separated with a single space are given.
-m::
--
1.3.3.g86f7
^ permalink raw reply related
* [PATCH 11/27] Documentation: Spelling fixes
From: Horst.H.von.Brand @ 2006-06-03 20:27 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Horst H. von Brand
In-Reply-To: <1149366468410-git-send-email->
From: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
---
Documentation/git-diff.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index 7267bcd..7ab2080 100644
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -85,7 +85,7 @@ Limiting the diff output::
nor deletion.
<2> show only names and the nature of change, but not actual
diff output. --name-status disables usual patch generation
-which in turn also disables recursive behaviour, so without -r
+which in turn also disables recursive behavior, so without -r
you would only see the directory name if there is a change in a
file in a subdirectory.
<3> limit diff output to named subtrees.
--
1.3.3.g86f7
^ permalink raw reply related
* [PATCH 17/27] Documentation: Spelling fixes
From: Horst.H.von.Brand @ 2006-06-03 20:27 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Horst H. von Brand
In-Reply-To: <11493664892352-git-send-email->
From: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
---
Documentation/git-repo-config.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-repo-config.txt b/Documentation/git-repo-config.txt
index 660c18f..d5142e0 100644
--- a/Documentation/git-repo-config.txt
+++ b/Documentation/git-repo-config.txt
@@ -49,7 +49,7 @@ OPTIONS
-------
--replace-all::
- Default behaviour is to replace at most one line. This replaces
+ Default behavior is to replace at most one line. This replaces
all lines matching the key (and optionally the value_regex).
--get::
--
1.3.3.g86f7
^ permalink raw reply related
* [PATCH 14/27] Documentation: Spelling fixes
From: Horst.H.von.Brand @ 2006-06-03 20:27 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Horst H. von Brand
In-Reply-To: <11493664773328-git-send-email->
From: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
---
Documentation/git-merge-index.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index 332e023..6cd0601 100644
--- a/Documentation/git-merge-index.txt
+++ b/Documentation/git-merge-index.txt
@@ -69,7 +69,7 @@ or
fatal: merge program failed
where the latter example shows how "git-merge-index" will stop trying to
-merge once anything has returned an error (ie "cat" returned an error
+merge once anything has returned an error (i.e., "cat" returned an error
for the AA file, because it didn't exist in the original, and thus
"git-merge-index" didn't even try to merge the MM thing).
--
1.3.3.g86f7
^ permalink raw reply related
* [PATCH 12/27] Documentation: Spelling fixes
From: Horst.H.von.Brand @ 2006-06-03 20:27 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Horst H. von Brand
In-Reply-To: <11493664701494-git-send-email->
From: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
---
Documentation/git-fsck-objects.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-fsck-objects.txt b/Documentation/git-fsck-objects.txt
index 93ce9dc..d0af99d 100644
--- a/Documentation/git-fsck-objects.txt
+++ b/Documentation/git-fsck-objects.txt
@@ -71,7 +71,7 @@ sorted properly etc), but on the whole i
do have a valid tree.
Any corrupt objects you will have to find in backups or other archives
-(ie you can just remove them and do an "rsync" with some other site in
+(i.e., you can just remove them and do an "rsync" with some other site in
the hopes that somebody else has the object you have corrupted).
Of course, "valid tree" doesn't mean that it wasn't generated by some
--
1.3.3.g86f7
^ permalink raw reply related
* [PATCH 8/27] Documentation: Spelling fixes
From: Horst.H.von.Brand @ 2006-06-03 20:27 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Horst H. von Brand
In-Reply-To: <1149366466232-git-send-email->
From: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
---
Documentation/git-daemon.txt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index 924a676..4c357da 100644
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -20,7 +20,7 @@ aka 9418. It waits for a connection, and
when it gets one.
It's careful in that there's a magic request-line that gives the command and
-what directory to upload, and it verifies that the directory is ok.
+what directory to upload, and it verifies that the directory is OK.
It verifies that the directory has the magic file "git-daemon-export-ok", and
it will refuse to export any git directory that hasn't explicitly been marked
@@ -28,7 +28,7 @@ for export this way (unless the '--expor
pass some directory paths as 'git-daemon' arguments, you can further restrict
the offers to a whitelist comprising of those.
-This is ideally suited for read-only updates, ie pulling from git repositories.
+This is ideally suited for read-only updates, i.e., pulling from git repositories.
OPTIONS
-------
--
1.3.3.g86f7
^ permalink raw reply related
* [PATCH 16/27] Documentation: Spelling fixes
From: Horst.H.von.Brand @ 2006-06-03 20:27 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Horst H. von Brand
In-Reply-To: <1149366483572-git-send-email->
From: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
---
Documentation/git-read-tree.txt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index 844cfda..02c7e99 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -205,7 +205,7 @@ The `git-write-tree` command refuses to
will complain about unmerged entries if it sees a single entry that is not
stage 0.
-Ok, this all sounds like a collection of totally nonsensical rules,
+OK, this all sounds like a collection of totally nonsensical rules,
but it's actually exactly what you want in order to do a fast
merge. The different stages represent the "result tree" (stage 0, aka
"merged"), the original tree (stage 1, aka "orig"), and the two trees
@@ -226,7 +226,7 @@ populated. Here is an outline of how th
- the index file saves and restores with all this information, so you
can merge things incrementally, but as long as it has entries in
- stages 1/2/3 (ie "unmerged entries") you can't write the result. So
+ stages 1/2/3 (i.e., "unmerged entries") you can't write the result. So
now the merge algorithm ends up being really simple:
* you walk the index in order, and ignore all entries of stage 0,
--
1.3.3.g86f7
^ permalink raw reply related
* [PATCH 9/27] Documentation: Spelling fixes
From: Horst.H.von.Brand @ 2006-06-03 20:27 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Horst H. von Brand
In-Reply-To: <11493664673957-git-send-email->
From: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
---
Documentation/git-diff-index.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt
index 5d2096a..9cd43f1 100644
--- a/Documentation/git-diff-index.txt
+++ b/Documentation/git-diff-index.txt
@@ -101,7 +101,7 @@ have not actually done a "git-update-ind
torvalds@ppc970:~/v2.6/linux> git-diff-index HEAD
*100644->100664 blob 7476bb......->000000...... kernel/sched.c
-ie it shows that the tree has changed, and that `kernel/sched.c` has is
+i.e., it shows that the tree has changed, and that `kernel/sched.c` has is
not up-to-date and may contain new stuff. The all-zero sha1 means that to
get the real diff, you need to look at the object in the working directory
directly rather than do an object-to-object diff.
--
1.3.3.g86f7
^ permalink raw reply related
* [PATCH 7/27] Documentation: Spelling fixes
From: Horst.H.von.Brand @ 2006-06-03 20:27 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Horst H. von Brand
In-Reply-To: <11493664652868-git-send-email->
From: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
---
Documentation/git-cvsserver.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt
index 4dc13c3..952635d 100644
--- a/Documentation/git-cvsserver.txt
+++ b/Documentation/git-cvsserver.txt
@@ -94,7 +94,7 @@ To get a checkout with the Eclipse CVS c
4. Pick 'HEAD' when it asks what branch/tag to check out. Untick the
"launch commit wizard" to avoid committing the .project file.
-Protocol notes: If you are using anonymous acces via pserver, just select that.
+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',
--
1.3.3.g86f7
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox