{"thread":{"id":"38036","subject":"[PATCH 71/71] Change 'usually' to 'by default'","startedAt":"2014-11-24T21:07:04Z","lastAt":"2014-11-25T01:11:32Z","messageCount":2,"participants":["Richard Littauer","Eric Sunshine"],"isPatch":true,"patchVersion":1,"patchTotal":71},"messages":[{"id":"252448","messageId":"1416863224-68392-1-git-send-email-richard.littauer@gmail.com","threadId":"38036","inReplyTo":null,"subject":"[PATCH 71/71] Change 'usually' to 'by default'","fromName":"Richard Littauer","fromEmail":"richard.littauer@gmail.com","sentAt":"2014-11-24T21:07:04Z","receivedAt":"2014-11-24T21:07:04Z","isPatch":true,"sender":{"key":"richard.littauer@gmail.com","avatar":null},"body":"I've been confused several times by the docs when running across\nthe word 'usually'. It is difficult to know before hand if it\nmeans 'under normal conditions' or 'by default'. I've gone through\nthe Documentation to identify specific cases where I think that 'by\ndefault' is more explanatory than 'usually'. I know that patches\nthat touch too much code is unwelcome - as this is a small fix to\nvery specific lines, I think this might be OK.\n\nFor the majority of cases, usually works fine. However, especially\nfor the docs concerning flags, it is good to know if 'usually' was\njust used by the documenter to mean 'unless your version has been\nexntensively modified' or if it mean \"unless you've messed up.\"\nHopefully, this isn't too pedantic.\n\nSigned-off-by: Richard Littauer \n---\n Documentation/git-branch.txt | 2 +-\n Documentation/git-cherry-pick.txt | 2 +-\n Documentation/git-commit.txt | 2 +-\n Documentation/git-grep.txt | 2 +-\n Documentation/git-http-push.txt | 2 +-\n Documentation/git-ls-files.txt | 2 +-\n Documentation/git-ls-remote.txt | 2 +-\n Documentation/git-mailinfo.txt | 2 +-\n Documentation/git-pack-refs.txt | 2 +-\n Documentation/git-push.txt | 4 ++--\n Documentation/git-read-tree.txt | 6 +++---\n Documentation/git-rev-parse.txt | 4 ++--\n Documentation/git-revert.txt | 2 +-\n Documentation/git-send-pack.txt | 2 +-\n Documentation/git-show-branch.txt | 2 +-\n Documentation/git-unpack-objects.txt | 2 +-\n Documentation/gitattributes.txt | 2 +-\n Documentation/gitcli.txt | 6 +++---\n Documentation/gitweb.conf.txt | 10 +++++-----\n Documentation/technical/api-parse-options.txt | 2 +-\n Documentation/technical/racy-git.txt | 4 ++--\n Documentation/user-manual.txt | 9 ++++-----\n builtin/apply.c | 2 +-\n contrib/hooks/multimail/README | 2 +-\n gitweb/INSTALL | 8 ++++----\n remote.c | 2 +-\n remote.h | 2 +-\n t/README | 2 +-\n 28 files changed, 45 insertions(+), 46 deletions(-)\n\ndiff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt\nindex 311b336..c5284e5 100644\n--- a/Documentation/git-branch.txt\n+++ b/Documentation/git-branch.txt\n@@ -88,7 +88,7 @@ OPTIONS\n \tCreate the branch's reflog. This activates recording of\n \tall changes made to the branch ref, enabling use of date\n \tbased sha1 expressions such as \"@\\{yesterday}\".\n-\tNote that in non-bare repositories, reflogs are usually\n+\tNote that in non-bare repositories, reflogs are\n \tenabled by default by the `core.logallrefupdates` config option.\n \n -f::\ndiff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt\nindex 1c03c79..6d8a43e 100644\n--- a/Documentation/git-cherry-pick.txt\n+++ b/Documentation/git-cherry-pick.txt\n@@ -86,7 +86,7 @@ OPTIONS\n \n -n::\n --no-commit::\n-\tUsually the command automatically creates a sequence of commits.\n+\tBy default the command automatically creates a sequence of commits.\n \tThis flag applies the changes necessary to cherry-pick\n \teach named commit to your working tree and the index,\n \twithout making any commit. In addition, when this\ndiff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt\nindex 0bbc8f5..d82add3 100644\n--- a/Documentation/git-commit.txt\n+++ b/Documentation/git-commit.txt\n@@ -203,7 +203,7 @@ variable (see linkgit:git-config[1]).\n -e::\n --edit::\n \tThe message taken from file with `-F`, command line with\n-\t`-m`, and from commit object with `-C` are usually used as\n+\t`-m`, and from commit object with `-C` are by default used as\n \tthe commit log message unmodified. This option lets you\n \tfurther edit the message taken from these sources.\n \ndiff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt\nindex 31811f1..f6b0638 100644\n--- a/Documentation/git-grep.txt\n+++ b/Documentation/git-grep.txt\n@@ -124,7 +124,7 @@ OPTIONS\n \tline.\n \n --full-name::\n-\tWhen run from a subdirectory, the command usually\n+\tWhen run from a subdirectory, the command by default\n \toutputs paths relative to the current directory. This\n \toption forces paths to be output relative to the project\n \ttop directory.\ndiff --git a/Documentation/git-http-push.txt b/Documentation/git-http-push.txt\nindex 2e67362..bd72f75 100644\n--- a/Documentation/git-http-push.txt\n+++ b/Documentation/git-http-push.txt\n@@ -28,7 +28,7 @@ OPTIONS\n \tref's history exist in the remote repository.\n \n --force::\n-\tUsually, the command refuses to update a remote ref that\n+\tBy default, the command refuses to update a remote ref that\n \tis not an ancestor of the local ref used to overwrite it.\n \tThis flag disables the check. What this means is that\n \tthe remote repository can lose commits; use it with\ndiff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt\nindex e26f01f..0a01570 100644\n--- a/Documentation/git-ls-files.txt\n+++ b/Documentation/git-ls-files.txt\n@@ -131,7 +131,7 @@ a space) at the start of each line:\n \tlinkgit:git-update-index[1]).\n \n --full-name::\n-\tWhen run from a subdirectory, the command usually\n+\tWhen run from a subdirectory, the command by default\n \toutputs paths relative to the current directory. This\n \toption forces paths to be output relative to the project\n \ttop directory.\ndiff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt\nindex 2e22915..faf7351 100644\n--- a/Documentation/git-ls-remote.txt\n+++ b/Documentation/git-ls-remote.txt\n@@ -38,7 +38,7 @@ OPTIONS\n \n --exit-code::\n \tExit with status \"2\" when no matching refs are found in the remote\n-\trepository. Usually the command exits with status \"0\" to indicate\n+\trepository. By default the command exits with status \"0\" to indicate\n \tit successfully talked with the remote repository, whether it\n \tfound any matching refs.\n \ndiff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt\nindex 164a3c6..342b2da 100644\n--- a/Documentation/git-mailinfo.txt\n+++ b/Documentation/git-mailinfo.txt\n@@ -25,7 +25,7 @@ command directly. See linkgit:git-am[1] instead.\n OPTIONS\n -------\n -k::\n-\tUsually the program removes email cruft from the Subject:\n+\tBy default the program removes email cruft from the Subject:\n \theader line to extract the title line for the commit log\n \tmessage. This option prevents this munging, and is most\n \tuseful when used to read back 'git format-patch -k' output.\ndiff --git a/Documentation/git-pack-refs.txt b/Documentation/git-pack-refs.txt\nindex 154081f..c97e62a 100644\n--- a/Documentation/git-pack-refs.txt\n+++ b/Documentation/git-pack-refs.txt\n@@ -56,7 +56,7 @@ a repository with many branches of historical interests.\n \n --no-prune::\n \n-The command usually removes loose refs under `$GIT_DIR/refs`\n+The command be default removes loose refs under `$GIT_DIR/refs`\n hierarchy after packing them. This option tells it not to.\n \n \ndiff --git a/Documentation/git-push.txt b/Documentation/git-push.txt\nindex c0d7403..48760f3 100644\n--- a/Documentation/git-push.txt\n+++ b/Documentation/git-push.txt\n@@ -139,7 +139,7 @@ already exists on the remote side.\n --[no-]force-with-lease::\n --force-with-lease=::\n --force-with-lease=:::\n-\tUsually, \"git push\" refuses to update a remote ref that is\n+\tBy default, \"git push\" refuses to update a remote ref that is\n \tnot an ancestor of the local ref used to overwrite it.\n +\n This option bypasses the check, but instead requires that the\n@@ -188,7 +188,7 @@ command line.\n \n -f::\n --force::\n-\tUsually, the command refuses to update a remote ref that is\n+\tBy default, the command refuses to update a remote ref that is\n \tnot an ancestor of the local ref used to overwrite it.\n \tAlso, when `--force-with-lease` option is used, the command refuses\n \tto update a remote ref whose current value does not match\ndiff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt\nindex fa1d557..91fb62f 100644\n--- a/Documentation/git-read-tree.txt\n+++ b/Documentation/git-read-tree.txt\n@@ -46,7 +46,7 @@ OPTIONS\n \ttree with the result of the merge.\n \n -i::\n-\tUsually a merge requires the index file as well as the\n+\tBy default a merge requires the index file as well as the\n \tfiles in the working tree to be up to date with the\n \tcurrent head commit, in order not to lose local\n \tchanges. This flag disables the check with the working\n@@ -69,7 +69,7 @@ OPTIONS\n \tconflicting files unresolved in the index.\n \n --aggressive::\n-\tUsually a three-way merge by 'git read-tree' resolves\n+\tBy default a three-way merge by 'git read-tree' resolves\n \tthe merge for really trivial cases and leaves other\n \tcases unresolved in the index, so that porcelains can\n \timplement different merge policies. This flag makes the\n@@ -91,7 +91,7 @@ OPTIONS\n --exclude-per-directory=::\n \tWhen running the command with `-u` and `-m` options, the\n \tmerge result may need to overwrite paths that are not\n-\ttracked in the current branch. The command usually\n+\ttracked in the current branch. The command by default\n \trefuses to proceed with the merge to avoid losing such a\n \tpath. However this safety valve sometimes gets in the\n \tway. For example, it often happens that the other\ndiff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt\nindex 0b84769..262cd01 100644\n--- a/Documentation/git-rev-parse.txt\n+++ b/Documentation/git-rev-parse.txt\n@@ -116,7 +116,7 @@ can be used.\n \tinstead exit with non-zero status silently.\n \n --sq::\n-\tUsually the output is made one line per flag and\n+\tBy default the output is made one line per flag and\n \tparameter. This option makes output a single line,\n \tproperly quoted for consumption by shell. Useful when\n \tyou expect your parameter to contain whitespaces and\n@@ -141,7 +141,7 @@ can be used.\n \t7 is used. The minimum length is 4.\n \n --symbolic::\n-\tUsually the object names are output in SHA-1 form (with\n+\tBy default the object names are output in SHA-1 form (with\n \tpossible '{caret}' prefix); this option makes them output in a\n \tform as close to the original input as possible.\n \ndiff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt\nindex cceb5f2..b0eae3e 100644\n--- a/Documentation/git-revert.txt\n+++ b/Documentation/git-revert.txt\n@@ -68,7 +68,7 @@ more details.\n \n -n::\n --no-commit::\n-\tUsually the command automatically creates some commits with\n+\tBy default the command automatically creates some commits with\n \tcommit log messages stating which commits were\n \treverted. This flag applies the changes necessary\n \tto revert the named commits to your working tree\ndiff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt\nindex 2a0de42..33a7599 100644\n--- a/Documentation/git-send-pack.txt\n+++ b/Documentation/git-send-pack.txt\n@@ -49,7 +49,7 @@ be in a separate packet, and the list must end with a flush packet.\n \tDo everything except actually send the updates.\n \n --force::\n-\tUsually, the command refuses to update a remote ref that\n+\tBy default, the command refuses to update a remote ref that\n \tis not an ancestor of the local ref used to overwrite it.\n \tThis flag disables the check. What this means is that\n \tthe remote repository can lose commits; use it with\ndiff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt\nindex b91d4e5..ef4cba3 100644\n--- a/Documentation/git-show-branch.txt\n+++ b/Documentation/git-show-branch.txt\n@@ -70,7 +70,7 @@ OPTIONS\n \tvisible.\n \n --more=::\n-\tUsually the command stops output upon showing the commit\n+\tBy default, the command stops output upon showing the commit\n \tthat is the common ancestor of all the branches. This\n \tflag tells the command to go more common commits\n \tbeyond that. When is negative, display only the\ndiff --git a/Documentation/git-unpack-objects.txt b/Documentation/git-unpack-objects.txt\nindex 12cb108..cbc51fe 100644\n--- a/Documentation/git-unpack-objects.txt\n+++ b/Documentation/git-unpack-objects.txt\n@@ -32,7 +32,7 @@ OPTIONS\n \tthe objects.\n \n -q::\n-\tThe command usually shows percentage progress. This\n+\tThe command shows percentage progress by default. This\n \tflag suppresses it.\n \n -r::\ndiff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt\nindex 643c1ba..5a5dd0d 100644\n--- a/Documentation/gitattributes.txt\n+++ b/Documentation/gitattributes.txt\n@@ -482,7 +482,7 @@ is prefixed with a line of the form:\n \n \t@@ -k,l +n,m @@ TEXT\n \n-This is called a 'hunk header'. The \"TEXT\" portion is by default a line\n+This is called a 'hunk header'. The \"TEXT\" portion is usually a line\n that begins with an alphabet, an underscore or a dollar sign; this\n matches what GNU 'diff -p' output uses. This default selection however\n is not suited for some contents, and you can use a customized pattern\ndiff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt\nindex dfe7d83..8259c5e 100644\n--- a/Documentation/gitcli.txt\n+++ b/Documentation/gitcli.txt\n@@ -187,19 +187,19 @@ different things.\n usually works on files in the working tree to *only* work\n with the index. For example, `git grep`, when used\n without a commit to specify from which commit to look for\n- strings in, usually works on files in the working tree,\n+ strings in, by default works on files in the working tree,\n but with the `--cached` option, it looks for strings in\n the index.\n \n * The `--index` option is used to ask a command that\n usually works on files in the working tree to *also*\n- affect the index. For example, `git stash apply` usually\n+ affect the index. For example, `git stash apply` by default\n merges changes recorded in a stash to the working tree,\n but with the `--index` option, it also merges changes to\n the index as well.\n \n `git apply` command can be used with `--cached` and\n-`--index` (but not at the same time). Usually the command\n+`--index` (but not at the same time). By default the command\n only affects the files in the working tree, but with\n `--index`, it patches both the files and their index\n entries, and with `--cached`, it modifies only the index\ndiff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt\nindex ebe7a6c..dc07b64 100644\n--- a/Documentation/gitweb.conf.txt\n+++ b/Documentation/gitweb.conf.txt\n@@ -222,7 +222,7 @@ The values of these variables are paths on the filesystem.\n \n $GIT::\n \tCore git executable to use. By default set to `$GIT_BINDIR/git`, which\n-\tin turn is by default set to `$(bindir)/git`. If you use Git installed\n+\tin turn is defaulted to `$(bindir)/git`. If you use Git installed\n \tfrom a binary package, you should usually set this to \"/usr/bin/git\".\n \tThis can just be \"git\" if your web server has a sensible PATH; from\n \tsecurity point of view it is better to use absolute path to git binary.\n@@ -409,7 +409,7 @@ $home_text::\n $projects_list_description_width::\n \tThe width (in characters) of the \"Description\" column of the projects list.\n \tLonger descriptions will be truncated (trying to cut at word boundary);\n-\tthe full description is available in the 'title' attribute (usually shown on\n+\tthe full description is available in the 'title' attribute (by default shown on\n \tmouseover). The default is 25, which might be too small if you\n \tuse long project descriptions.\n \n@@ -431,7 +431,7 @@ These configuration variables control _internal_ gitweb behavior.\n \n $default_blob_plain_mimetype::\n \tDefault mimetype for the blob_plain (raw) view, if mimetype checking\n-\tdoesn't result in some other type; by default \"text/plain\".\n+\tdoesn't result in some other type; usually \"text/plain\".\n \tGitweb guesses mimetype of a file to display based on extension\n \tof its filename, using `$mimetypes_file` (if set and file exists)\n \tand '/etc/mime.types' files (see *mime.types*(5) manpage; only\n@@ -633,10 +633,10 @@ override::\n \toverridable, which means that it can be configured\n \t(or enabled/disabled) on a per-repository basis.\n +\n-Usually given \"\" is configurable via the `gitweb.`\n+Usually the given \"\" is configurable via the `gitweb.`\n config variable in the per-repository Git configuration file.\n +\n-*Note* that no feature is overridable by default.\n+*Note* that no feature is overridable usually.\n \n sub::\n \tInternal detail of implementation. What is important is that\ndiff --git a/Documentation/technical/api-parse-options.txt b/Documentation/technical/api-parse-options.txt\nindex 1f2db31..7212d3f 100644\n--- a/Documentation/technical/api-parse-options.txt\n+++ b/Documentation/technical/api-parse-options.txt\n@@ -82,7 +82,7 @@ Flags are the bitwise-or of:\n \tnon-option arguments.\n \n `PARSE_OPT_STOP_AT_NON_OPTION`::\n-\tUsually the whole argument vector is massaged and reordered.\n+\tBy default the whole argument vector is massaged and reordered.\n \tUsing this flag, processing is stopped at the first non-option\n \targument.\n \ndiff --git a/Documentation/technical/racy-git.txt b/Documentation/technical/racy-git.txt\nindex 242a044..8c577ee 100644\n--- a/Documentation/technical/racy-git.txt\n+++ b/Documentation/technical/racy-git.txt\n@@ -38,10 +38,10 @@ files vs symbolic links) and executable bits (only for regular\n files) from `st_mode` member, `st_mtime` and `st_ctime`\n timestamps, `st_uid`, `st_gid`, `st_ino`, and `st_size` members.\n With a `USE_STDEV` compile-time option, `st_dev` is also\n-compared, but this is not enabled by default because this member\n+compared, but this is not enabled usually because this member\n is not stable on network filesystems. With `USE_NSEC`\n compile-time option, `st_mtim.tv_nsec` and `st_ctim.tv_nsec`\n-members are also compared, but this is not enabled by default\n+members are also compared, but this is not enabled usually\n because in-core timestamps can have finer granularity than\n on-disk timestamps, resulting in meaningless changes when an\n inode is evicted from the inode cache. See commit 8ce13b0\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex 7330d88..de7423a 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -405,7 +405,7 @@ linkgit:git-pack-refs[1]).\n \n As another useful shortcut, the \"HEAD\" of a repository can be referred\n to just using the name of that repository. So, for example, \"origin\"\n-is usually a shortcut for the HEAD branch in the repository \"origin\".\n+is by default a shortcut for the HEAD branch in the repository \"origin\".\n \n For the complete list of paths which Git checks for references, and\n the order it uses to decide which to choose when there are multiple\n@@ -1398,7 +1398,7 @@ $ git add file.txt\n -------------------------------------------------\n \n the different stages of that file will be \"collapsed\", after which\n-`git diff` will (by default) no longer show diffs for that file.\n+`git diff` will (usually) no longer show diffs for that file.\n \n [[undoing-a-merge]]\n Undoing a merge\n@@ -1759,8 +1759,7 @@ remote-tracking branches `origin/*`, and merge the default branch into\n the current branch.\n \n More generally, a branch that is created from a remote-tracking branch\n-will pull\n-by default from that branch. See the descriptions of the\n+will pull usually from that branch. See the descriptions of the\n `branch..remote` and `branch..merge` options in\n linkgit:git-config[1], and the discussion of the `--track` option in\n linkgit:git-checkout[1], to learn how to control these defaults.\n@@ -2170,7 +2169,7 @@ linkgit:git-fetch[1] to keep them up-to-date; see\n Now create the branches in which you are going to work; these start out\n at the current tip of origin/master branch, and should be set up (using\n the `--track` option to linkgit:git-branch[1]) to merge changes in from\n-Linus by default.\n+Linus usually.\n \n -------------------------------------------------\n $ git branch --track test origin/master\ndiff --git a/builtin/apply.c b/builtin/apply.c\nindex 6b7c764..fb3749f 100644\n--- a/builtin/apply.c\n+++ b/builtin/apply.c\n@@ -3085,7 +3085,7 @@ static struct patch *in_fn_table(const char *name)\n \n /*\n * item->util in the filename table records the status of the path.\n- * Usually it points at a patch (whose result records the contents\n+ * By default it points at a patch (whose result records the contents\n * of it after applying it), but it could be PATH_WAS_DELETED for a\n * path that a previously applied patch has already removed, or\n * PATH_TO_BE_DELETED for a path that a later patch would remove.\ndiff --git a/contrib/hooks/multimail/README b/contrib/hooks/multimail/README\nindex 477d65f..6967151 100644\n--- a/contrib/hooks/multimail/README\n+++ b/contrib/hooks/multimail/README\n@@ -138,7 +138,7 @@ community.)\n Configuration\n -------------\n \n-By default, git-multimail mostly takes its configuration from the\n+By default, git-multimail takes most of its configuration from the\n following \"git config\" settings:\n \n multimailhook.environment\ndiff --git a/gitweb/INSTALL b/gitweb/INSTALL\nindex 408f285..23636b9 100644\n--- a/gitweb/INSTALL\n+++ b/gitweb/INSTALL\n@@ -63,14 +63,14 @@ See also \"How to configure gitweb for your local system\" section below.\n use GITWEB_PROJECTROOT build configuration variable.\n \n By default all git repositories under projectroot are visible and\n- available to gitweb. The list of projects is generated by default by\n+ available to gitweb. The list of projects is generated usually by\n scanning the projectroot directory for git repositories. This can be\n changed (configured) as described in \"Gitweb repositories\" section\n below.\n \n Note that gitweb deals directly with the object database, and does not\n need a working directory; the name of the project is the name of its\n- repository object database, usually projectname.git for bare\n+ repository object database, by default projectname.git for bare\n repositories. If you want to provide gitweb access to non-bare (live)\n repositories, you can make projectname.git a symbolic link under\n projectroot linking to projectname/.git (but it is just\n@@ -140,7 +140,7 @@ You can specify the following configuration variables when building GIT:\n gitweb.cgi script. [No default]\n * GITWEB_HOME_LINK_STR\n String of the home link on top of all pages, leading to $home_link\n- (usually main gitweb page, which means projects list). Used as first\n+ (by default main gitweb page, which means projects list). Used as first\n part of gitweb view \"breadcrumb trail\": / / .\n [Default: projects]\n * GITWEB_SITENAME\n@@ -234,7 +234,7 @@ See also \"Runtime gitweb configuration\" section in README file\n for gitweb (in gitweb/README), and gitweb.conf(5) manpage.\n \n - You can configure gitweb further using the per-instance gitweb configuration file;\n- by default this is a file named gitweb_config.perl in the same place as\n+ usually this is a file named gitweb_config.perl in the same place as\n gitweb.cgi script. You can control the default place for the config file\n using the GITWEB_CONFIG build configuration variable, and you can set it\n using the GITWEB_CONFIG environment variable. If this file does not\ndiff --git a/remote.c b/remote.c\nindex 3d6c86a..109f445 100644\n--- a/remote.c\n+++ b/remote.c\n@@ -754,7 +754,7 @@ static void handle_duplicate(struct ref *ref1, struct ref *ref2)\n \t\t\t ref1->name, ref2->name, ref2->peer_ref->name);\n \t\t} else if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&\n \t\t\t ref2->fetch_head_status == FETCH_HEAD_IGNORE) {\n-\t\t\twarning(_(\"%s usually tracks %s, not %s\"),\n+\t\t\twarning(_(\"%s by default tracks %s, not %s\"),\n \t\t\t\tref2->peer_ref->name, ref2->name, ref1->name);\n \t\t} else if (ref1->fetch_head_status == FETCH_HEAD_IGNORE &&\n \t\t\t ref2->fetch_head_status == FETCH_HEAD_IGNORE) {\ndiff --git a/remote.h b/remote.h\nindex 917d383..58161d8 100644\n--- a/remote.h\n+++ b/remote.h\n@@ -181,7 +181,7 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,\n * beforehand, and will be set to the tail pointer of the list of\n * results afterward.\n *\n- * missing_ok is usually false, but when we are adding branch.$name.merge\n+ * missing_ok is by default false, but when we are adding branch.$name.merge\n * it is Ok if the branch is not at the remote anymore.\n */\n int get_fetch_map(const struct ref *remote_refs, const struct refspec *refspec,\ndiff --git a/t/README b/t/README\nindex 52c77ae..f5a173d 100644\n--- a/t/README\n+++ b/t/README\n@@ -504,7 +504,7 @@ library for your script to use.\n \n - test_expect_success []