From ea5aeb07e9ad92743eaaf216360340b70d4c3bbd Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 3 Jun 2006 23:44:40 -0700 Subject: fetch: do not report "same" unless -verbose. Signed-off-by: Junio C Hamano --- git-fetch.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git-fetch.sh b/git-fetch.sh index 69bd810082..48818f8224 100755 --- a/git-fetch.sh +++ b/git-fetch.sh @@ -166,7 +166,10 @@ fast_forward_local () { mb=$(git-merge-base "$local" "$2") && case "$2,$mb" in $local,*) - echo >&2 "* $1: same as $3" + if test -n "$verbose" + then + echo >&2 "* $1: same as $3" + fi ;; *,$local) echo >&2 "* $1: fast forward to $3" -- cgit v1.2.3 From 895f10c3b596ef955c7f252717e5b4668530c569 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 3 Jun 2006 18:45:43 +0200 Subject: Builtin git-rev-parse. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- Makefile | 7 +- builtin-rev-parse.c | 365 ++++++++++++++++++++++++++++++++++++++++++++++++++++ builtin.h | 1 + git.c | 3 +- rev-parse.c | 364 --------------------------------------------------- 5 files changed, 371 insertions(+), 369 deletions(-) create mode 100644 builtin-rev-parse.c delete mode 100644 rev-parse.c diff --git a/Makefile b/Makefile index b6fce394e9..004c2169c9 100644 --- a/Makefile +++ b/Makefile @@ -154,8 +154,7 @@ PROGRAMS = \ git-hash-object$X git-index-pack$X git-local-fetch$X \ git-mailinfo$X git-merge-base$X \ git-merge-index$X git-mktag$X git-mktree$X git-pack-objects$X git-patch-id$X \ - git-peek-remote$X git-prune-packed$X \ - git-receive-pack$X git-rev-parse$X \ + git-peek-remote$X git-prune-packed$X git-receive-pack$X \ git-send-pack$X git-shell$X \ git-show-index$X git-ssh-fetch$X \ git-ssh-upload$X git-unpack-file$X \ @@ -168,7 +167,7 @@ PROGRAMS = \ BUILT_INS = git-log$X git-whatchanged$X git-show$X \ git-count-objects$X git-diff$X git-push$X \ git-grep$X git-add$X git-rm$X git-rev-list$X \ - git-check-ref-format$X \ + git-check-ref-format$X git-rev-parse$X \ git-init-db$X git-tar-tree$X git-upload-tar$X git-format-patch$X \ git-ls-files$X git-ls-tree$X \ git-read-tree$X git-commit-tree$X \ @@ -222,7 +221,7 @@ LIB_OBJS = \ BUILTIN_OBJS = \ builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \ builtin-grep.o builtin-add.o builtin-rev-list.o builtin-check-ref-format.o \ - builtin-rm.o builtin-init-db.o \ + builtin-rm.o builtin-init-db.o builtin-rev-parse.o \ builtin-tar-tree.o builtin-upload-tar.o \ builtin-ls-files.o builtin-ls-tree.o \ builtin-read-tree.o builtin-commit-tree.o \ diff --git a/builtin-rev-parse.c b/builtin-rev-parse.c new file mode 100644 index 0000000000..c353a481b0 --- /dev/null +++ b/builtin-rev-parse.c @@ -0,0 +1,365 @@ +/* + * rev-parse.c + * + * Copyright (C) Linus Torvalds, 2005 + */ +#include "cache.h" +#include "commit.h" +#include "refs.h" +#include "quote.h" +#include "builtin.h" + +#define DO_REVS 1 +#define DO_NOREV 2 +#define DO_FLAGS 4 +#define DO_NONFLAGS 8 +static int filter = ~0; + +static char *def = NULL; + +#define NORMAL 0 +#define REVERSED 1 +static int show_type = NORMAL; +static int symbolic = 0; +static int abbrev = 0; +static int output_sq = 0; + +static int revs_count = 0; + +/* + * Some arguments are relevant "revision" arguments, + * others are about output format or other details. + * This sorts it all out. + */ +static int is_rev_argument(const char *arg) +{ + static const char *rev_args[] = { + "--all", + "--bisect", + "--dense", + "--branches", + "--header", + "--max-age=", + "--max-count=", + "--min-age=", + "--no-merges", + "--objects", + "--objects-edge", + "--parents", + "--pretty", + "--remotes", + "--sparse", + "--tags", + "--topo-order", + "--date-order", + "--unpacked", + NULL + }; + const char **p = rev_args; + + /* accept -, like traditional "head" */ + if ((*arg == '-') && isdigit(arg[1])) + return 1; + + for (;;) { + const char *str = *p++; + int len; + if (!str) + return 0; + len = strlen(str); + if (!strcmp(arg, str) || + (str[len-1] == '=' && !strncmp(arg, str, len))) + return 1; + } +} + +/* Output argument as a string, either SQ or normal */ +static void show(const char *arg) +{ + if (output_sq) { + int sq = '\'', ch; + + putchar(sq); + while ((ch = *arg++)) { + if (ch == sq) + fputs("'\\'", stdout); + putchar(ch); + } + putchar(sq); + putchar(' '); + } + else + puts(arg); +} + +/* Output a revision, only if filter allows it */ +static void show_rev(int type, const unsigned char *sha1, const char *name) +{ + if (!(filter & DO_REVS)) + return; + def = NULL; + revs_count++; + + if (type != show_type) + putchar('^'); + if (symbolic && name) + show(name); + else if (abbrev) + show(find_unique_abbrev(sha1, abbrev)); + else + show(sha1_to_hex(sha1)); +} + +/* Output a flag, only if filter allows it. */ +static int show_flag(char *arg) +{ + if (!(filter & DO_FLAGS)) + return 0; + if (filter & (is_rev_argument(arg) ? DO_REVS : DO_NOREV)) { + show(arg); + return 1; + } + return 0; +} + +static void show_default(void) +{ + char *s = def; + + if (s) { + unsigned char sha1[20]; + + def = NULL; + if (!get_sha1(s, sha1)) { + show_rev(NORMAL, sha1, s); + return; + } + } +} + +static int show_reference(const char *refname, const unsigned char *sha1) +{ + show_rev(NORMAL, sha1, refname); + return 0; +} + +static void show_datestring(const char *flag, const char *datestr) +{ + static char buffer[100]; + + /* date handling requires both flags and revs */ + if ((filter & (DO_FLAGS | DO_REVS)) != (DO_FLAGS | DO_REVS)) + return; + snprintf(buffer, sizeof(buffer), "%s%lu", flag, approxidate(datestr)); + show(buffer); +} + +static int show_file(const char *arg) +{ + show_default(); + if ((filter & (DO_NONFLAGS|DO_NOREV)) == (DO_NONFLAGS|DO_NOREV)) { + show(arg); + return 1; + } + return 0; +} + +int cmd_rev_parse(int argc, const char **argv, char **envp) +{ + int i, as_is = 0, verify = 0; + unsigned char sha1[20]; + const char *prefix = setup_git_directory(); + + git_config(git_default_config); + + for (i = 1; i < argc; i++) { + char *arg = argv[i]; + char *dotdot; + + if (as_is) { + if (show_file(arg) && as_is < 2) + verify_filename(prefix, arg); + continue; + } + if (!strcmp(arg,"-n")) { + if (++i >= argc) + die("-n requires an argument"); + if ((filter & DO_FLAGS) && (filter & DO_REVS)) { + show(arg); + show(argv[i]); + } + continue; + } + if (!strncmp(arg,"-n",2)) { + if ((filter & DO_FLAGS) && (filter & DO_REVS)) + show(arg); + continue; + } + + if (*arg == '-') { + if (!strcmp(arg, "--")) { + as_is = 2; + /* Pass on the "--" if we show anything but files.. */ + if (filter & (DO_FLAGS | DO_REVS)) + show_file(arg); + continue; + } + if (!strcmp(arg, "--default")) { + def = argv[i+1]; + i++; + continue; + } + if (!strcmp(arg, "--revs-only")) { + filter &= ~DO_NOREV; + continue; + } + if (!strcmp(arg, "--no-revs")) { + filter &= ~DO_REVS; + continue; + } + if (!strcmp(arg, "--flags")) { + filter &= ~DO_NONFLAGS; + continue; + } + if (!strcmp(arg, "--no-flags")) { + filter &= ~DO_FLAGS; + continue; + } + if (!strcmp(arg, "--verify")) { + filter &= ~(DO_FLAGS|DO_NOREV); + verify = 1; + continue; + } + if (!strcmp(arg, "--short") || + !strncmp(arg, "--short=", 8)) { + filter &= ~(DO_FLAGS|DO_NOREV); + verify = 1; + abbrev = DEFAULT_ABBREV; + if (arg[7] == '=') + abbrev = strtoul(arg + 8, NULL, 10); + if (abbrev < MINIMUM_ABBREV) + abbrev = MINIMUM_ABBREV; + else if (40 <= abbrev) + abbrev = 40; + continue; + } + if (!strcmp(arg, "--sq")) { + output_sq = 1; + continue; + } + if (!strcmp(arg, "--not")) { + show_type ^= REVERSED; + continue; + } + if (!strcmp(arg, "--symbolic")) { + symbolic = 1; + continue; + } + if (!strcmp(arg, "--all")) { + for_each_ref(show_reference); + continue; + } + if (!strcmp(arg, "--branches")) { + for_each_branch_ref(show_reference); + continue; + } + if (!strcmp(arg, "--tags")) { + for_each_tag_ref(show_reference); + continue; + } + if (!strcmp(arg, "--remotes")) { + for_each_remote_ref(show_reference); + continue; + } + if (!strcmp(arg, "--show-prefix")) { + if (prefix) + puts(prefix); + continue; + } + if (!strcmp(arg, "--show-cdup")) { + const char *pfx = prefix; + while (pfx) { + pfx = strchr(pfx, '/'); + if (pfx) { + pfx++; + printf("../"); + } + } + putchar('\n'); + continue; + } + if (!strcmp(arg, "--git-dir")) { + const char *gitdir = getenv(GIT_DIR_ENVIRONMENT); + static char cwd[PATH_MAX]; + if (gitdir) { + puts(gitdir); + continue; + } + if (!prefix) { + puts(".git"); + continue; + } + if (!getcwd(cwd, PATH_MAX)) + die("unable to get current working directory"); + printf("%s/.git\n", cwd); + continue; + } + if (!strncmp(arg, "--since=", 8)) { + show_datestring("--max-age=", arg+8); + continue; + } + if (!strncmp(arg, "--after=", 8)) { + show_datestring("--max-age=", arg+8); + continue; + } + if (!strncmp(arg, "--before=", 9)) { + show_datestring("--min-age=", arg+9); + continue; + } + if (!strncmp(arg, "--until=", 8)) { + show_datestring("--min-age=", arg+8); + continue; + } + if (show_flag(arg) && verify) + die("Needed a single revision"); + continue; + } + + /* Not a flag argument */ + dotdot = strstr(arg, ".."); + if (dotdot) { + unsigned char end[20]; + char *next = dotdot + 2; + char *this = arg; + *dotdot = 0; + if (!*next) + next = "HEAD"; + if (dotdot == arg) + this = "HEAD"; + if (!get_sha1(this, sha1) && !get_sha1(next, end)) { + show_rev(NORMAL, end, next); + show_rev(REVERSED, sha1, this); + continue; + } + *dotdot = '.'; + } + if (!get_sha1(arg, sha1)) { + show_rev(NORMAL, sha1, arg); + continue; + } + if (*arg == '^' && !get_sha1(arg+1, sha1)) { + show_rev(REVERSED, sha1, arg+1); + continue; + } + as_is = 1; + if (!show_file(arg)) + continue; + if (verify) + die("Needed a single revision"); + verify_filename(prefix, arg); + } + show_default(); + if (verify && revs_count != 1) + die("Needed a single revision"); + return 0; +} diff --git a/builtin.h b/builtin.h index 738ec3d945..ffa9340c37 100644 --- a/builtin.h +++ b/builtin.h @@ -43,5 +43,6 @@ extern int cmd_diff_index(int argc, const char **argv, char **envp); extern int cmd_diff_stages(int argc, const char **argv, char **envp); extern int cmd_diff_tree(int argc, const char **argv, char **envp); extern int cmd_cat_file(int argc, const char **argv, char **envp); +extern int cmd_rev_parse(int argc, const char **argv, char **envp); #endif diff --git a/git.c b/git.c index 10ea934bcf..bc463c98ea 100644 --- a/git.c +++ b/git.c @@ -69,7 +69,8 @@ static void handle_internal_command(int argc, const char **argv, char **envp) { "diff-index", cmd_diff_index }, { "diff-stages", cmd_diff_stages }, { "diff-tree", cmd_diff_tree }, - { "cat-file", cmd_cat_file } + { "cat-file", cmd_cat_file }, + { "rev-parse", cmd_rev_parse } }; int i; diff --git a/rev-parse.c b/rev-parse.c deleted file mode 100644 index 4e2d9fbdf6..0000000000 --- a/rev-parse.c +++ /dev/null @@ -1,364 +0,0 @@ -/* - * rev-parse.c - * - * Copyright (C) Linus Torvalds, 2005 - */ -#include "cache.h" -#include "commit.h" -#include "refs.h" -#include "quote.h" - -#define DO_REVS 1 -#define DO_NOREV 2 -#define DO_FLAGS 4 -#define DO_NONFLAGS 8 -static int filter = ~0; - -static char *def = NULL; - -#define NORMAL 0 -#define REVERSED 1 -static int show_type = NORMAL; -static int symbolic = 0; -static int abbrev = 0; -static int output_sq = 0; - -static int revs_count = 0; - -/* - * Some arguments are relevant "revision" arguments, - * others are about output format or other details. - * This sorts it all out. - */ -static int is_rev_argument(const char *arg) -{ - static const char *rev_args[] = { - "--all", - "--bisect", - "--dense", - "--branches", - "--header", - "--max-age=", - "--max-count=", - "--min-age=", - "--no-merges", - "--objects", - "--objects-edge", - "--parents", - "--pretty", - "--remotes", - "--sparse", - "--tags", - "--topo-order", - "--date-order", - "--unpacked", - NULL - }; - const char **p = rev_args; - - /* accept -, like traditional "head" */ - if ((*arg == '-') && isdigit(arg[1])) - return 1; - - for (;;) { - const char *str = *p++; - int len; - if (!str) - return 0; - len = strlen(str); - if (!strcmp(arg, str) || - (str[len-1] == '=' && !strncmp(arg, str, len))) - return 1; - } -} - -/* Output argument as a string, either SQ or normal */ -static void show(const char *arg) -{ - if (output_sq) { - int sq = '\'', ch; - - putchar(sq); - while ((ch = *arg++)) { - if (ch == sq) - fputs("'\\'", stdout); - putchar(ch); - } - putchar(sq); - putchar(' '); - } - else - puts(arg); -} - -/* Output a revision, only if filter allows it */ -static void show_rev(int type, const unsigned char *sha1, const char *name) -{ - if (!(filter & DO_REVS)) - return; - def = NULL; - revs_count++; - - if (type != show_type) - putchar('^'); - if (symbolic && name) - show(name); - else if (abbrev) - show(find_unique_abbrev(sha1, abbrev)); - else - show(sha1_to_hex(sha1)); -} - -/* Output a flag, only if filter allows it. */ -static int show_flag(char *arg) -{ - if (!(filter & DO_FLAGS)) - return 0; - if (filter & (is_rev_argument(arg) ? DO_REVS : DO_NOREV)) { - show(arg); - return 1; - } - return 0; -} - -static void show_default(void) -{ - char *s = def; - - if (s) { - unsigned char sha1[20]; - - def = NULL; - if (!get_sha1(s, sha1)) { - show_rev(NORMAL, sha1, s); - return; - } - } -} - -static int show_reference(const char *refname, const unsigned char *sha1) -{ - show_rev(NORMAL, sha1, refname); - return 0; -} - -static void show_datestring(const char *flag, const char *datestr) -{ - static char buffer[100]; - - /* date handling requires both flags and revs */ - if ((filter & (DO_FLAGS | DO_REVS)) != (DO_FLAGS | DO_REVS)) - return; - snprintf(buffer, sizeof(buffer), "%s%lu", flag, approxidate(datestr)); - show(buffer); -} - -static int show_file(const char *arg) -{ - show_default(); - if ((filter & (DO_NONFLAGS|DO_NOREV)) == (DO_NONFLAGS|DO_NOREV)) { - show(arg); - return 1; - } - return 0; -} - -int main(int argc, char **argv) -{ - int i, as_is = 0, verify = 0; - unsigned char sha1[20]; - const char *prefix = setup_git_directory(); - - git_config(git_default_config); - - for (i = 1; i < argc; i++) { - char *arg = argv[i]; - char *dotdot; - - if (as_is) { - if (show_file(arg) && as_is < 2) - verify_filename(prefix, arg); - continue; - } - if (!strcmp(arg,"-n")) { - if (++i >= argc) - die("-n requires an argument"); - if ((filter & DO_FLAGS) && (filter & DO_REVS)) { - show(arg); - show(argv[i]); - } - continue; - } - if (!strncmp(arg,"-n",2)) { - if ((filter & DO_FLAGS) && (filter & DO_REVS)) - show(arg); - continue; - } - - if (*arg == '-') { - if (!strcmp(arg, "--")) { - as_is = 2; - /* Pass on the "--" if we show anything but files.. */ - if (filter & (DO_FLAGS | DO_REVS)) - show_file(arg); - continue; - } - if (!strcmp(arg, "--default")) { - def = argv[i+1]; - i++; - continue; - } - if (!strcmp(arg, "--revs-only")) { - filter &= ~DO_NOREV; - continue; - } - if (!strcmp(arg, "--no-revs")) { - filter &= ~DO_REVS; - continue; - } - if (!strcmp(arg, "--flags")) { - filter &= ~DO_NONFLAGS; - continue; - } - if (!strcmp(arg, "--no-flags")) { - filter &= ~DO_FLAGS; - continue; - } - if (!strcmp(arg, "--verify")) { - filter &= ~(DO_FLAGS|DO_NOREV); - verify = 1; - continue; - } - if (!strcmp(arg, "--short") || - !strncmp(arg, "--short=", 8)) { - filter &= ~(DO_FLAGS|DO_NOREV); - verify = 1; - abbrev = DEFAULT_ABBREV; - if (arg[7] == '=') - abbrev = strtoul(arg + 8, NULL, 10); - if (abbrev < MINIMUM_ABBREV) - abbrev = MINIMUM_ABBREV; - else if (40 <= abbrev) - abbrev = 40; - continue; - } - if (!strcmp(arg, "--sq")) { - output_sq = 1; - continue; - } - if (!strcmp(arg, "--not")) { - show_type ^= REVERSED; - continue; - } - if (!strcmp(arg, "--symbolic")) { - symbolic = 1; - continue; - } - if (!strcmp(arg, "--all")) { - for_each_ref(show_reference); - continue; - } - if (!strcmp(arg, "--branches")) { - for_each_branch_ref(show_reference); - continue; - } - if (!strcmp(arg, "--tags")) { - for_each_tag_ref(show_reference); - continue; - } - if (!strcmp(arg, "--remotes")) { - for_each_remote_ref(show_reference); - continue; - } - if (!strcmp(arg, "--show-prefix")) { - if (prefix) - puts(prefix); - continue; - } - if (!strcmp(arg, "--show-cdup")) { - const char *pfx = prefix; - while (pfx) { - pfx = strchr(pfx, '/'); - if (pfx) { - pfx++; - printf("../"); - } - } - putchar('\n'); - continue; - } - if (!strcmp(arg, "--git-dir")) { - const char *gitdir = getenv(GIT_DIR_ENVIRONMENT); - static char cwd[PATH_MAX]; - if (gitdir) { - puts(gitdir); - continue; - } - if (!prefix) { - puts(".git"); - continue; - } - if (!getcwd(cwd, PATH_MAX)) - die("unable to get current working directory"); - printf("%s/.git\n", cwd); - continue; - } - if (!strncmp(arg, "--since=", 8)) { - show_datestring("--max-age=", arg+8); - continue; - } - if (!strncmp(arg, "--after=", 8)) { - show_datestring("--max-age=", arg+8); - continue; - } - if (!strncmp(arg, "--before=", 9)) { - show_datestring("--min-age=", arg+9); - continue; - } - if (!strncmp(arg, "--until=", 8)) { - show_datestring("--min-age=", arg+8); - continue; - } - if (show_flag(arg) && verify) - die("Needed a single revision"); - continue; - } - - /* Not a flag argument */ - dotdot = strstr(arg, ".."); - if (dotdot) { - unsigned char end[20]; - char *next = dotdot + 2; - char *this = arg; - *dotdot = 0; - if (!*next) - next = "HEAD"; - if (dotdot == arg) - this = "HEAD"; - if (!get_sha1(this, sha1) && !get_sha1(next, end)) { - show_rev(NORMAL, end, next); - show_rev(REVERSED, sha1, this); - continue; - } - *dotdot = '.'; - } - if (!get_sha1(arg, sha1)) { - show_rev(NORMAL, sha1, arg); - continue; - } - if (*arg == '^' && !get_sha1(arg+1, sha1)) { - show_rev(REVERSED, sha1, arg+1); - continue; - } - as_is = 1; - if (!show_file(arg)) - continue; - if (verify) - die("Needed a single revision"); - verify_filename(prefix, arg); - } - show_default(); - if (verify && revs_count != 1) - die("Needed a single revision"); - return 0; -} -- cgit v1.2.3 From abda1ef590d94a5e15e7ce3b685b5c092a790cfa Mon Sep 17 00:00:00 2001 From: "Horst H. von Brand" Date: Sat, 3 Jun 2006 16:27:26 -0400 Subject: Documentation: Spelling fixes Signed-off-by: Horst H. von Brand Signed-off-by: Junio C Hamano --- Documentation/config.txt | 16 ++++++++-------- Documentation/core-tutorial.txt | 6 +++--- Documentation/cvs-migration.txt | 4 ++-- Documentation/git-apply.txt | 2 +- Documentation/git-blame.txt | 2 +- Documentation/git-commit.txt | 2 +- Documentation/git-cvsserver.txt | 2 +- Documentation/git-daemon.txt | 4 ++-- Documentation/git-diff-index.txt | 2 +- Documentation/git-diff-tree.txt | 4 ++-- Documentation/git-diff.txt | 2 +- Documentation/git-fsck-objects.txt | 2 +- Documentation/git-grep.txt | 4 ++-- Documentation/git-merge-index.txt | 2 +- Documentation/git-patch-id.txt | 2 +- Documentation/git-read-tree.txt | 4 ++-- Documentation/git-repo-config.txt | 2 +- Documentation/git-reset.txt | 2 +- Documentation/git-rev-parse.txt | 4 ++-- Documentation/git-send-email.txt | 2 +- Documentation/git-send-pack.txt | 2 +- Documentation/git-sh-setup.txt | 2 +- Documentation/git-tools.txt | 2 +- Documentation/git-update-index.txt | 2 +- Documentation/hooks.txt | 4 ++-- Documentation/technical/pack-heuristics.txt | 2 +- Documentation/tutorial-2.txt | 2 +- Documentation/tutorial.txt | 8 ++++---- 28 files changed, 47 insertions(+), 47 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index d1a4bec0d4..cd56afd021 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2,7 +2,7 @@ CONFIGURATION FILE ------------------ The git configuration file contains a number of variables that affect -the git commands behaviour. They can be used by both the git plumbing +the git commands behavior. They can be used by both the git plumbing and the porcelains. The variables are divided to sections, where in the fully qualified variable name the variable itself is the last dot-separated segment and the section name is everything before the last @@ -53,7 +53,7 @@ core.gitProxy:: may be set multiple times and is matched in the given order; the first match wins. - Can be overriden by the 'GIT_PROXY_COMMAND' environment variable + Can be overridden by the 'GIT_PROXY_COMMAND' environment variable (which always applies universally, without the special "for" handling). @@ -115,12 +115,12 @@ http.sslCert:: http.sslKey:: File containing the SSL private key when fetching or pushing - over HTTPS. Can be overriden by the 'GIT_SSL_KEY' environment + over HTTPS. Can be overridden by the 'GIT_SSL_KEY' environment variable. http.sslCAInfo:: File containing the certificates to verify the peer with when - fetching or pushing over HTTPS. Can be overriden by the + fetching or pushing over HTTPS. Can be overridden by the 'GIT_SSL_CAINFO' environment variable. http.sslCAPath:: @@ -129,13 +129,13 @@ http.sslCAPath:: by the 'GIT_SSL_CAPATH' environment variable. http.maxRequests:: - How many HTTP requests to launch in parallel. Can be overriden + How many HTTP requests to launch in parallel. Can be overridden by the 'GIT_HTTP_MAX_REQUESTS' environment variable. Default is 5. http.lowSpeedLimit, http.lowSpeedTime:: If the HTTP transfer speed is less than 'http.lowSpeedLimit' for longer than 'http.lowSpeedTime' seconds, the transfer is aborted. - Can be overriden by the 'GIT_HTTP_LOW_SPEED_LIMIT' and + Can be overridden by the 'GIT_HTTP_LOW_SPEED_LIMIT' and 'GIT_HTTP_LOW_SPEED_TIME' environment variables. i18n.commitEncoding:: @@ -166,12 +166,12 @@ showbranch.default:: user.email:: Your email address to be recorded in any newly created commits. - Can be overriden by the 'GIT_AUTHOR_EMAIL' and 'GIT_COMMITTER_EMAIL' + Can be overridden by the 'GIT_AUTHOR_EMAIL' and 'GIT_COMMITTER_EMAIL' environment variables. See gitlink:git-commit-tree[1]. user.name:: Your full name to be recorded in any newly created commits. - Can be overriden by the 'GIT_AUTHOR_NAME' and 'GIT_COMMITTER_NAME' + Can be overridden by the 'GIT_AUTHOR_NAME' and 'GIT_COMMITTER_NAME' environment variables. See gitlink:git-commit-tree[1]. whatchanged.difftree:: diff --git a/Documentation/core-tutorial.txt b/Documentation/core-tutorial.txt index 5a831adf43..1185897f70 100644 --- a/Documentation/core-tutorial.txt +++ b/Documentation/core-tutorial.txt @@ -184,7 +184,7 @@ $ git-cat-file -t 557db03de997c86a4a028e1ebd3a1ceb225be238 ---------------- where the `-t` tells `git-cat-file` to tell you what the "type" of the -object is. git will tell you that you have a "blob" object (ie just a +object is. git will tell you that you have a "blob" object (i.e., just a regular file), and you can see the contents with ---------------- @@ -619,7 +619,7 @@ $ git tag -s ---------------- which will sign the current `HEAD` (but you can also give it another -argument that specifies the thing to tag, ie you could have tagged the +argument that specifies the thing to tag, i.e., you could have tagged the current `mybranch` point by using `git tag mybranch`). You normally only do signed tags for major releases or things @@ -1097,7 +1097,7 @@ commit object by downloading from `repo.git/objects/xx/xxx\...` using the object name of that commit object. Then it reads the commit object to find out its parent commits and the associate tree object; it repeats this process until it gets all the -necessary objects. Because of this behaviour, they are +necessary objects. Because of this behavior, they are sometimes also called 'commit walkers'. + The 'commit walkers' are sometimes also called 'dumb diff --git a/Documentation/cvs-migration.txt b/Documentation/cvs-migration.txt index fa94efde8d..826d0897e2 100644 --- a/Documentation/cvs-migration.txt +++ b/Documentation/cvs-migration.txt @@ -1,7 +1,7 @@ git for CVS users ================= -So you're a CVS user. That's ok, it's a treatable condition. The job of +So you're a CVS user. That's OK, it's a treatable condition. The job of this document is to put you on the road to recovery, by helping you convert an existing cvs repository to git, and by showing you how to use a git repository in a cvs-like fashion. @@ -159,7 +159,7 @@ other than `master`. [NOTE] ============ -Because of this behaviour, if the shared repository and the developer's +Because of this behavior, if the shared repository and the developer's repository both have branches named `origin`, then a push like the above attempts to update the `origin` branch in the shared repository from the developer's `origin` branch. The results may be unexpected, so it's diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index e93ea1f265..9cc7c74dea 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -113,7 +113,7 @@ OPTIONS When `git-apply` is used for statistics and not applying a patch, it defaults to `nowarn`. You can use different `