From: Junio C Hamano Date: Mon, 12 Sep 2011 04:52:18 +0000 (-0700) Subject: Merge branch 'jn/doc-dashdash' into maint X-Git-Tag: v1.7.6.3~10 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7baf32a829e6e253f8b3b683da470be36b54c377?ds=inline;hp=-c Merge branch 'jn/doc-dashdash' into maint * jn/doc-dashdash: Documentation/i18n: quote double-dash for AsciiDoc Documentation: quote double-dash for AsciiDoc Conflicts: Documentation/git-mergetool--lib.txt --- 7baf32a829e6e253f8b3b683da470be36b54c377 diff --combined Documentation/config.txt index 4914d768c7,98eb4d9715..ae9913b034 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@@ -344,9 -344,7 +344,9 @@@ core.logAllRefUpdates: SHA1, the date/time and the reason of the update, but only when the file exists. If this configuration variable is set to true, missing "$GIT_DIR/logs/" - file is automatically created for branch heads. + file is automatically created for branch heads (i.e. under + refs/heads/), remote refs (i.e. under refs/remotes/), + note refs (i.e. under refs/notes/), and the symbolic ref HEAD. + This information can be used to determine what commit was the tip of a branch "2 days ago". @@@ -678,7 -676,7 +678,7 @@@ branch..rebase: browser..cmd:: Specify the command to invoke the specified browser. The specified command is evaluated in shell with the URLs passed - as arguments. (See linkgit:git-web--browse[1].) + as arguments. (See linkgit:git-web{litdd}browse[1].) browser..path:: Override the path for the given tool that may be used to diff --combined Documentation/git-mergetool--lib.txt index 8c5be6775d,5b0d51f7f8..f98a41b87c --- a/Documentation/git-mergetool--lib.txt +++ b/Documentation/git-mergetool--lib.txt @@@ -7,8 -7,7 +7,8 @@@ git-mergetool--lib - Common git merge t SYNOPSIS -------- +[verse] - 'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool--lib"' + 'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool{litdd}lib"' DESCRIPTION ----------- diff --combined Documentation/git-revert.txt index e4b46cfd3f,6a21b37f95..3d0a7d1dac --- a/Documentation/git-revert.txt +++ b/Documentation/git-revert.txt @@@ -7,7 -7,6 +7,7 @@@ git-revert - Revert some existing commi SYNOPSIS -------- +[verse] 'git revert' [--edit | --no-edit] [-n] [-m parent-number] [-s] ... DESCRIPTION @@@ -24,7 -23,7 +24,7 @@@ throw away all uncommitted changes in y should see linkgit:git-reset[1], particularly the '--hard' option. If you want to extract specific files as they were in another commit, you should see linkgit:git-checkout[1], specifically the `git checkout - -- ` syntax. Take care with these alternatives as + \-- ` syntax. Take care with these alternatives as both will discard uncommitted changes in your working directory. OPTIONS diff --combined Documentation/git-sh-i18n.txt index eafa55af7e,eca69e3d82..60cf49cb2a --- a/Documentation/git-sh-i18n.txt +++ b/Documentation/git-sh-i18n.txt @@@ -7,7 -7,6 +7,7 @@@ git-sh-i18n - Git's i18n setup code fo SYNOPSIS -------- +[verse] '. "$(git --exec-path)/git-sh-i18n"' DESCRIPTION @@@ -35,7 -34,7 +35,7 @@@ gettext: eval_gettext:: Currently a dummy fall-through function implemented as a wrapper around `printf(1)` with variables expanded by the - linkgit:git-sh-i18n--envsubst[1] helper. Will be replaced by a + linkgit:git-sh-i18n{litdd}envsubst[1] helper. Will be replaced by a real gettext implementation in a later version. GIT diff --combined Documentation/git-submodule.txt index 585f03681b,12af4de5e1..0ec85742dd --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@@ -78,9 -78,7 +78,9 @@@ to exist in the superproject. If is the URL of the new submodule's origin repository. This may be either an absolute URL, or (if it begins with ./ or ../), the location relative to the superproject's origin -repository. +repository. If the superproject doesn't have an origin configured +the superproject is its own authoritative upstream and the current +working directory is used instead. + is the relative location for the cloned submodule to exist in the superproject. If does not exist, then the @@@ -169,14 -167,12 +169,14 @@@ commit for each submodule sync:: Synchronizes submodules' remote URL configuration setting - to the value specified in .gitmodules. This is useful when + to the value specified in .gitmodules. It will only affect those + submodules which already have an url entry in .git/config (that is the + case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly. + "git submodule sync" synchronizes all submodules while - "git submodule sync -- A" synchronizes submodule "A" only. + "git submodule sync \-- A" synchronizes submodule "A" only. OPTIONS ------- diff --combined Documentation/git-web--browse.txt index 8b4f65ae44,9b0d1fe395..c2bc87bc61 --- a/Documentation/git-web--browse.txt +++ b/Documentation/git-web--browse.txt @@@ -7,7 -7,6 +7,7 @@@ git-web--browse - git helper script to SYNOPSIS -------- +[verse] 'git web{litdd}browse' [OPTIONS] URL/FILE ... DESCRIPTION @@@ -69,7 -68,7 +69,7 @@@ browser..pat You can explicitly provide a full path to your preferred browser by setting the configuration variable 'browser..path'. For example, you can configure the absolute path to firefox by setting - 'browser.firefox.path'. Otherwise, 'git web--browse' assumes the tool + 'browser.firefox.path'. Otherwise, 'git web{litdd}browse' assumes the tool is available in PATH. browser..cmd diff --combined Documentation/rev-list-options.txt index 62340a5e4c,554ab8c88b..39e6207269 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@@ -272,7 -272,7 +272,7 @@@ Default mode: --full-history:: - As the default mode but does not prune some history. + Same as the default mode, but does not prune some history. --dense:: @@@ -313,7 -313,7 +313,7 @@@ that you are filtering for a file `foo \ / / / / `-------------' ----------------------------------------------------------------------- - The horizontal line of history A--P is taken to be the first parent of + The horizontal line of history A---P is taken to be the first parent of each merge. The commits are: * `I` is the initial commit, in which `foo` exists with contents