From: Junio C Hamano Date: Sun, 8 Jun 2008 22:49:47 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.6-rc2-15-g457bb X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eb415999b469f6d3e718f2fdf28dd460d8db5f4f;p=git.git Autogenerated HTML docs for v1.5.6-rc2-15-g457bb --- diff --git a/blame-options.txt b/blame-options.txt index c11bb7d36..5428111d7 100644 --- a/blame-options.txt +++ b/blame-options.txt @@ -41,7 +41,8 @@ of lines before or after the line given by . -S :: Use revs from revs-file instead of calling linkgit:git-rev-list[1]. --p, --porcelain:: +-p:: +--porcelain:: Show in a format designed for machine consumption. --incremental:: @@ -83,5 +84,6 @@ alphanumeric characters that git must detect as moving between files for it to associate those lines with the parent commit. --h, --help:: +-h:: +--help:: Show help message. diff --git a/fetch-options.txt b/fetch-options.txt index b67591148..85c87180d 100644 --- a/fetch-options.txt +++ b/fetch-options.txt @@ -1,22 +1,26 @@ --q, \--quiet:: +-q:: +--quiet:: Pass --quiet to git-fetch-pack and silence any other internally used programs. --v, \--verbose:: +-v:: +--verbose:: Be verbose. --a, \--append:: +-a:: +--append:: Append ref names and object names of fetched refs to the existing contents of `.git/FETCH_HEAD`. Without this option old data in `.git/FETCH_HEAD` will be overwritten. -\--upload-pack :: +--upload-pack :: When given, and the repository to fetch from is handled by 'git-fetch-pack', '--exec=' is passed to the command to specify non-default path for the command run on the other end. --f, \--force:: +-f:: +--force:: When `git-fetch` is used with `:` refspec, it refuses to update the local branch `` unless the remote branch `` it @@ -24,16 +28,18 @@ overrides that check. ifdef::git-pull[] -\--no-tags:: +--no-tags:: endif::git-pull[] ifndef::git-pull[] --n, \--no-tags:: +-n:: +--no-tags:: endif::git-pull[] By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following. --t, \--tags:: +-t:: +--tags:: Most of the tags are fetched automatically as branch heads are downloaded, but tags that do not point at objects reachable from the branch heads that are being @@ -41,10 +47,12 @@ endif::git-pull[] flag lets all tags and their associated objects be downloaded. --k, \--keep:: +-k:: +--keep:: Keep downloaded pack. --u, \--update-head-ok:: +-u:: +--update-head-ok:: By default `git-fetch` refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for `git-pull` @@ -52,7 +60,7 @@ endif::git-pull[] implementing your own Porcelain you are not supposed to use it. -\--depth=:: +--depth=:: Deepen the history of a 'shallow' repository created by `git clone` with `--depth=` option (see linkgit:git-clone[1]) by the specified number of commits. diff --git a/git-add.html b/git-add.html index 0d3b6cdfd..6b7be87af 100644 --- a/git-add.html +++ b/git-add.html @@ -316,7 +316,10 @@ commit.

--n, --dry-run +-n +
+
+--dry-run

@@ -324,7 +327,10 @@ commit.

--v, --verbose +-v +
+
+--verbose

@@ -340,7 +346,10 @@ commit.

--i, --interactive +-i +
+
+--interactive

@@ -351,7 +360,10 @@ commit.

--p, --patch +-p +
+
+--patch

@@ -604,7 +616,7 @@ double-quote and control characters will still have problems.

diff --git a/git-add.txt b/git-add.txt index 88165da38..9c6b081e6 100644 --- a/git-add.txt +++ b/git-add.txt @@ -50,22 +50,26 @@ OPTIONS and `dir/file2`) can be given to add all files in the directory, recursively. --n, \--dry-run:: +-n:: +--dry-run:: Don't actually add the file(s), just show if they exist. --v, \--verbose:: +-v:: +--verbose:: Be verbose. -f:: Allow adding otherwise ignored files. --i, \--interactive:: +-i:: +--interactive:: Add modified contents in the working tree interactively to the index. Optional path arguments may be supplied to limit operation to a subset of the working tree. See ``Interactive mode'' for details. --p, \--patch:: +-p:: +--patch:: Similar to Interactive mode but the initial command loop is bypassed and the 'patch' subcommand is invoked using each of the specified filepatterns before exiting. @@ -79,11 +83,11 @@ OPTIONS command line. If no paths are specified, all tracked files in the current directory and its subdirectories are updated. -\--refresh:: +--refresh:: Don't add the file(s), but only refresh their stat() information in the index. -\--ignore-errors:: +--ignore-errors:: If some files could not be added because of errors indexing them, do not abort the operation, but continue adding the others. The command shall still exit with non-zero status. diff --git a/git-am.html b/git-am.html index c39f5e73c..eb6c0c57d 100644 --- a/git-am.html +++ b/git-am.html @@ -299,7 +299,10 @@ current branch.

--s, --signoff +-s +
+
+--signoff

@@ -308,7 +311,10 @@ current branch.

--k, --keep +-k +
+
+--keep

@@ -316,7 +322,10 @@ current branch.

--u, --utf8 +-u +
+
+--utf8

@@ -339,7 +348,10 @@ default. You could use --no-utf8 to override this.

--3, --3way +-3 +
+
+--3way

@@ -350,7 +362,10 @@ default. You could use --no-utf8 to override this.

--b, --binary +-b +
+
+--binary

@@ -369,7 +384,10 @@ default. You could use --no-utf8 to override this.

--C<n>, -p<n> +-C<n> +
+
+-p<n>

@@ -379,7 +397,10 @@ default. You could use --no-utf8 to override this.

--i, --interactive +-i +
+
+--interactive

@@ -396,7 +417,10 @@ default. You could use --no-utf8 to override this.

--r, --resolved +-r +
+
+--resolved

@@ -500,7 +524,7 @@ names.

diff --git a/git-am.txt b/git-am.txt index 7f6f5b472..46544a076 100644 --- a/git-am.txt +++ b/git-am.txt @@ -28,14 +28,17 @@ OPTIONS supply this argument, reads from the standard input. If you supply directories, they'll be treated as Maildirs. --s, --signoff:: +-s:: +--signoff:: Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. --k, --keep:: +-k:: +--keep:: Pass `-k` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]). --u, --utf8:: +-u:: +--utf8:: Pass `-u` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]). The proposed commit log message taken from the e-mail is re-coded into UTF-8 encoding (configuration variable @@ -49,13 +52,15 @@ default. You could use `--no-utf8` to override this. Pass `-n` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]). --3, --3way:: +-3:: +--3way:: When the patch does not apply cleanly, fall back on 3-way merge, if the patch records the identity of blobs it is supposed to apply to, and we have those blobs available locally. --b, --binary:: +-b:: +--binary:: Pass `--allow-binary-replacement` flag to `git-apply` (see linkgit:git-apply[1]). @@ -64,19 +69,22 @@ default. You could use `--no-utf8` to override this. program that applies the patch. --C, -p:: +-C:: +-p:: These flags are passed to the `git-apply` (see linkgit:git-apply[1]) program that applies the patch. --i, --interactive:: +-i:: +--interactive:: Run interactively. --skip:: Skip the current patch. This is only meaningful when restarting an aborted patch. --r, --resolved:: +-r:: +--resolved:: After a patch failure (e.g. attempting to apply conflicting patch), the user has applied it by hand and the index file stores the result of the application. diff --git a/git-annotate.html b/git-annotate.html index f299d5d39..4846d3ae1 100644 --- a/git-annotate.html +++ b/git-annotate.html @@ -366,7 +366,10 @@ of lines before or after the line given by <start>.

--p, --porcelain +-p +
+
+--porcelain

@@ -431,7 +434,10 @@ between files for it to associate those lines with the parent commit.

--h, --help +-h +
+
+--help

@@ -454,7 +460,7 @@ commit.

diff --git a/git-apply.html b/git-apply.html index b6a1b6d04..975846595 100644 --- a/git-apply.html +++ b/git-apply.html @@ -378,7 +378,10 @@ and a work tree.

the information is read from the current index instead.

--R, --reverse +-R +
+
+--reverse

@@ -468,7 +471,10 @@ discouraged.

---allow-binary-replacement, --binary +--allow-binary-replacement +
+
+--binary

@@ -552,7 +558,10 @@ behavior:

--v, --verbose +-v +
+
+--verbose

@@ -604,7 +613,7 @@ subdirectory is checked and (if possible) updated.

diff --git a/git-apply.txt b/git-apply.txt index 76277bd17..c8347637d 100644 --- a/git-apply.txt +++ b/git-apply.txt @@ -73,7 +73,8 @@ OPTIONS When a pure mode change is encountered (which has no index information), the information is read from the current index instead. --R, --reverse:: +-R:: +--reverse:: Apply the patch in reverse. --reject:: @@ -124,7 +125,8 @@ discouraged. the result with this option, which would apply the deletion part but not addition part. ---allow-binary-replacement, --binary:: +--allow-binary-replacement:: +--binary:: Historically we did not allow binary patch applied without an explicit permission from the user, and this flag was the way to do so. Currently we always allow binary @@ -169,7 +171,8 @@ behavior: correctly. This option adds support for applying such patches by working around this bug. --v, --verbose:: +-v:: +--verbose:: Report progress to stderr. By default, only a message about the current patch being applied will be printed. This option will cause additional information to be reported. diff --git a/git-archive.html b/git-archive.html index 258ab6b7e..614551a25 100644 --- a/git-archive.html +++ b/git-archive.html @@ -305,7 +305,10 @@ comment.

---list, -l +-l +
+
+--list

@@ -313,7 +316,10 @@ comment.

---verbose, -v +-v +
+
+--verbose

@@ -469,7 +475,7 @@ git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ > git-1.4.0-d

diff --git a/git-archive.txt b/git-archive.txt index a3e36dbb0..9b5f3ae5e 100644 --- a/git-archive.txt +++ b/git-archive.txt @@ -36,10 +36,12 @@ OPTIONS Format of the resulting archive: 'tar' or 'zip'. The default is 'tar'. ---list, -l:: +-l:: +--list:: Show all available formats. ---verbose, -v:: +-v:: +--verbose:: Report progress to stderr. --prefix=/:: diff --git a/git-blame.html b/git-blame.html index 835181502..8dc36ec09 100644 --- a/git-blame.html +++ b/git-blame.html @@ -384,7 +384,10 @@ of lines before or after the line given by <start>.

--p, --porcelain +-p +
+
+--porcelain

@@ -449,7 +452,10 @@ between files for it to associate those lines with the parent commit.

--h, --help +-h +
+
+--help

@@ -479,7 +485,10 @@ commit.

--f, --show-name +-f +
+
+--show-name

@@ -489,7 +498,10 @@ commit.

--n, --show-number +-n +
+
+--show-number

@@ -686,7 +698,7 @@ commit commentary), a blame viewer won't ever care.

diff --git a/git-blame.txt b/git-blame.txt index 7900f33d4..8f4fb4668 100644 --- a/git-blame.txt +++ b/git-blame.txt @@ -52,12 +52,14 @@ include::blame-options.txt[] a certain threshold for git-blame to consider those lines of code to have been moved. --f, --show-name:: +-f:: +--show-name:: Show filename in the original commit. By default filename is shown if there is any line that came from a file with different name, due to rename detection. --n, --show-number:: +-n:: +--show-number:: Show line number in the original commit (Default: off). -s:: diff --git a/git-branch.html b/git-branch.html index a0f767483..59bb85d54 100644 --- a/git-branch.html +++ b/git-branch.html @@ -405,7 +405,10 @@ clean up all obsolete remote-tracking branches.

--v, --verbose +-v +
+
+--verbose

@@ -613,7 +616,7 @@ but different purposes:

diff --git a/git-branch.txt b/git-branch.txt index a70fa76f3..0fd58083e 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -95,7 +95,8 @@ OPTIONS -a:: List both remote-tracking branches and local branches. --v, --verbose:: +-v:: +--verbose:: Show sha1 and commit subject line for each head. --abbrev=:: diff --git a/git-checkout-index.html b/git-checkout-index.html index eb5fca0d7..748515a93 100644 --- a/git-checkout-index.html +++ b/git-checkout-index.html @@ -288,7 +288,10 @@ git-checkout-index(1) Manual Page
--u|--index +-u +
+
+--index

@@ -297,7 +300,10 @@ git-checkout-index(1) Manual Page

--q|--quiet +-q +
+
+--quiet

@@ -305,7 +311,10 @@ git-checkout-index(1) Manual Page

--f|--force +-f +
+
+--force

@@ -313,7 +322,10 @@ git-checkout-index(1) Manual Page

--a|--all +-a +
+
+--all

@@ -322,7 +334,10 @@ git-checkout-index(1) Manual Page

--n|--no-create +-n +
+
+--no-create

@@ -511,7 +526,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

diff --git a/git-checkout-index.txt b/git-checkout-index.txt index a8cad9c21..676203b2e 100644 --- a/git-checkout-index.txt +++ b/git-checkout-index.txt @@ -22,21 +22,26 @@ Will copy all files listed from the index to the working directory OPTIONS ------- --u|--index:: +-u:: +--index:: update stat information for the checked out entries in the index file. --q|--quiet:: +-q:: +--quiet:: be quiet if files exist or are not in the index --f|--force:: +-f:: +--force:: forces overwrite of existing files --a|--all:: +-a:: +--all:: checks out all files in the index. Cannot be used together with explicit filenames. --n|--no-create:: +-n:: +--no-create:: Don't checkout new files, only refresh files already checked out. diff --git a/git-checkout.html b/git-checkout.html index c2331bd00..bfad47f73 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -326,7 +326,10 @@ working tree.

--t, --track +-t +
+
+--track

@@ -539,7 +542,7 @@ $ git add frotz

diff --git a/git-checkout.txt b/git-checkout.txt index a5bf9d6f8..3ad9760a4 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -47,7 +47,8 @@ OPTIONS by linkgit:git-check-ref-format[1]. Some of these checks may restrict the characters allowed in a branch name. --t, --track:: +-t:: +--track:: When creating a new branch, set up configuration so that git-pull will automatically retrieve data from the start point, which must be a branch. Use this if you always pull from the same upstream branch diff --git a/git-cherry-pick.html b/git-cherry-pick.html index f2233ee1b..109760e2b 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html @@ -294,7 +294,10 @@ modifications from the HEAD commit).

--e|--edit +-e +
+
+--edit

@@ -331,7 +334,10 @@ modifications from the HEAD commit).

--m parent-number|--mainline parent-number +-m parent-number +
+
+--mainline parent-number

@@ -343,7 +349,10 @@ modifications from the HEAD commit).

--n|--no-commit +-n +
+
+--no-commit

@@ -360,7 +369,10 @@ modifications from the HEAD commit).

effect to your working tree in a row.

--s|--signoff +-s +
+
+--signoff

@@ -383,7 +395,7 @@ effect to your working tree in a row.

diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt index 3762272b8..5ac9cfb0e 100644 --- a/git-cherry-pick.txt +++ b/git-cherry-pick.txt @@ -22,7 +22,8 @@ OPTIONS For a more complete list of ways to spell commits, see "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1]. --e|--edit:: +-e:: +--edit:: With this option, `git-cherry-pick` will let you edit the commit message prior to committing. @@ -44,14 +45,16 @@ OPTIONS described above, and `-r` was to disable it. Now the default is not to do `-x` so this option is a no-op. --m parent-number|--mainline parent-number:: +-m parent-number:: +--mainline parent-number:: Usually you cannot cherry-pick a merge because you do not know which side of the merge should be considered the mainline. This option specifies the parent number (starting from 1) of the mainline and allows cherry-pick to replay the change relative to the specified parent. --n|--no-commit:: +-n:: +--no-commit:: Usually the command automatically creates a commit with a commit log message stating which commit was cherry-picked. This flag applies the change necessary @@ -64,7 +67,8 @@ OPTIONS This is useful when cherry-picking more than one commits' effect to your working tree in a row. --s|--signoff:: +-s:: +--signoff:: Add Signed-off-by line at the end of the commit message. diff --git a/git-clean.html b/git-clean.html index da993cc6c..ecf487dda 100644 --- a/git-clean.html +++ b/git-clean.html @@ -307,6 +307,9 @@ affected are further limited to those that match them.

-n
+
+--dry-run +

Don't actually remove anything, just show what would be done. @@ -315,6 +318,9 @@ affected are further limited to those that match them.

-q
+
+--quiet +

Be quiet, only report errors, but not the files that are @@ -353,7 +359,7 @@ affected are further limited to those that match them.

diff --git a/git-clean.txt b/git-clean.txt index deebf3b31..37a82ee4b 100644 --- a/git-clean.txt +++ b/git-clean.txt @@ -30,9 +30,11 @@ OPTIONS git-clean will refuse to run unless given -f or -n. -n:: +--dry-run:: Don't actually remove anything, just show what would be done. -q:: +--quiet:: Be quiet, only report errors, but not the files that are successfully removed. diff --git a/git-commit.html b/git-commit.html index 8742eb32a..59f8050d0 100644 --- a/git-commit.html +++ b/git-commit.html @@ -273,9 +273,9 @@ git-commit(1) Manual Page

SYNOPSIS

-
git-commit [-a | --interactive] [-s] [-v] [-u] - [(-c | -C) <commit> | -F <file> | -m <msg> | --amend] - [--allow-empty] [--no-verify] [-e] [--author <author>] +
git-commit [-a | --interactive] [-s] [-v] [-u] [--amend] + [(-c | -C) <commit>] [-F <file> | -m <msg>] + [--allow-empty] [--no-verify] [-e] [--author=<author>] [--cleanup=<mode>] [--] [[-i | -o ]<file>…]

DESCRIPTION

@@ -332,7 +332,10 @@ that, you can recover from it with git-reset(1).

--a|--all +-a +
+
+--all

@@ -342,20 +345,36 @@ that, you can recover from it with git-reset(1).

--c or -C <commit> +-C <commit> +
+
+--reuse-message=<commit>

- Take existing commit object, and reuse the log message + Take an existing commit object, and reuse the log message and the authorship information (including the timestamp) - when creating the commit. With -C, the editor is not - invoked; with -c the user can further edit the commit - message. + when creating the commit. +

+
+
+-c <commit> +
+
+--reedit-message=<commit> +
+
+

+ Like -C, but with -c the editor is invoked, so that + the user can further edit the commit message.

-F <file>
+
+--file=<file> +

Take the commit message from the given file. Use - to @@ -363,7 +382,7 @@ that, you can recover from it with git-reset(1).

---author <author> +--author=<author>

@@ -372,7 +391,10 @@ that, you can recover from it with git-reset(1).

--m <msg>|--message=<msg> +-m <msg> +
+
+--message=<msg>

@@ -380,7 +402,10 @@ that, you can recover from it with git-reset(1).

--t <file>|--template=<file> +-t <file> +
+
+--template=<file>

@@ -392,7 +417,10 @@ that, you can recover from it with git-reset(1).

--s|--signoff +-s +
+
+--signoff

@@ -400,6 +428,9 @@ that, you can recover from it with git-reset(1).

+-n +
+
--no-verify
@@ -435,7 +466,10 @@ that, you can recover from it with git-reset(1).

--e|--edit +-e +
+
+--edit

@@ -470,7 +504,10 @@ that, you can recover from it with git-reset(1).

but can be used to amend a merge commit.

--i|--include +-i +
+
+--include

@@ -481,7 +518,10 @@ that, you can recover from it with git-reset(1).

--o|--only +-o +
+
+--only

@@ -497,7 +537,10 @@ that, you can recover from it with git-reset(1).

--u|--untracked-files +-u +
+
+--untracked-files

@@ -509,7 +552,10 @@ that, you can recover from it with git-reset(1).

--v|--verbose +-v +
+
+--verbose

@@ -520,7 +566,10 @@ that, you can recover from it with git-reset(1).

--q|--quiet +-q +
+
+--quiet

@@ -746,7 +795,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-commit.txt b/git-commit.txt index 02d4baab6..7e8b4ff72 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -8,9 +8,9 @@ git-commit - Record changes to the repository SYNOPSIS -------- [verse] -'git-commit' [-a | --interactive] [-s] [-v] [-u] - [(-c | -C) | -F | -m | --amend] - [--allow-empty] [--no-verify] [-e] [--author ] +'git-commit' [-a | --interactive] [-s] [-v] [-u] [--amend] + [(-c | -C) ] [-F | -m ] + [--allow-empty] [--no-verify] [-e] [--author=] [--cleanup=] [--] [[-i | -o ]...] DESCRIPTION @@ -52,39 +52,49 @@ that, you can recover from it with linkgit:git-reset[1]. OPTIONS ------- --a|--all:: +-a:: +--all:: Tell the command to automatically stage files that have been modified and deleted, but new files you have not told git about are not affected. --c or -C :: - Take existing commit object, and reuse the log message +-C :: +--reuse-message=:: + Take an existing commit object, and reuse the log message and the authorship information (including the timestamp) - when creating the commit. With '-C', the editor is not - invoked; with '-c' the user can further edit the commit - message. + when creating the commit. + +-c :: +--reedit-message=:: + Like '-C', but with '-c' the editor is invoked, so that + the user can further edit the commit message. -F :: +--file=:: Take the commit message from the given file. Use '-' to read the message from the standard input. ---author :: +--author=:: Override the author name used in the commit. Use `A U Thor ` format. --m |--message=:: +-m :: +--message=:: Use the given as the commit message. --t |--template=:: +-t :: +--template=:: Use the contents of the given file as the initial version of the commit message. The editor is invoked and you can make subsequent changes. If a message is specified using the `-m` or `-F` options, this option has no effect. This overrides the `commit.template` configuration variable. --s|--signoff:: +-s:: +--signoff:: Add Signed-off-by line at the end of the commit message. +-n:: --no-verify:: This option bypasses the pre-commit and commit-msg hooks. See also linkgit:githooks[5][hooks]. @@ -105,14 +115,14 @@ OPTIONS 'whitespace' removes just leading/trailing whitespace lines and 'strip' removes both whitespace and commentary. --e|--edit:: +-e:: +--edit:: The message taken from file with `-F`, command line with `-m`, and from file with `-C` are usually used as the commit log message unmodified. This option lets you further edit the message taken from these sources. --amend:: - Used to amend the tip of the current branch. Prepare the tree object you would want to replace the latest commit as usual (this includes the usual -i/-o and explicit paths), and the @@ -133,13 +143,15 @@ It is a rough equivalent for: but can be used to amend a merge commit. -- --i|--include:: +-i:: +--include:: Before making a commit out of staged contents so far, stage the contents of paths given on the command line as well. This is usually not what you want unless you are concluding a conflicted merge. --o|--only:: +-o:: +--only:: Make a commit only from the paths specified on the command line, disregarding any contents that have been staged so far. This is the default mode of operation of @@ -150,20 +162,23 @@ but can be used to amend a merge commit. the last commit without committing changes that have already been staged. --u|--untracked-files:: +-u:: +--untracked-files:: Show all untracked files, also those in uninteresting directories, in the "Untracked files:" section of commit message template. Without this option only its name and a trailing slash are displayed for each untracked directory. --v|--verbose:: +-v:: +--verbose:: Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template. Note that this diff output doesn't have its lines prefixed with '#'. --q|--quiet:: +-q:: +--quiet:: Suppress commit summary message. \--:: diff --git a/git-config.html b/git-config.html index 647c02c3d..d8355c171 100644 --- a/git-config.html +++ b/git-config.html @@ -421,7 +421,10 @@ rather than from all available files.

See also [FILES].

--f config-file, --file config-file +-f config-file +
+
+--file config-file

@@ -461,7 +464,10 @@ rather than from all available files.

--l, --list +-l +
+
+--list

@@ -488,7 +494,10 @@ rather than from all available files.

--z, --null +-z +
+
+--null

@@ -2592,7 +2601,7 @@ web.browser

diff --git a/git-config.txt b/git-config.txt index 84b754f8d..c90421ee7 100644 --- a/git-config.txt +++ b/git-config.txt @@ -101,7 +101,8 @@ rather than from all available files. + See also <>. --f config-file, --file config-file:: +-f config-file:: +--file config-file:: Use the given config file instead of the one specified by GIT_CONFIG. --remove-section:: @@ -116,7 +117,8 @@ See also <>. --unset-all:: Remove all lines matching the key from config file. --l, --list:: +-l:: +--list:: List all variables set in config file. --bool:: @@ -128,7 +130,8 @@ See also <>. in the config file will cause the value to be multiplied by 1024, 1048576, or 1073741824 prior to output. --z, --null:: +-z:: +--null:: For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between diff --git a/git-count-objects.html b/git-count-objects.html index 371bbffa4..ba981a523 100644 --- a/git-count-objects.html +++ b/git-count-objects.html @@ -285,6 +285,9 @@ them, to help you decide when it is a good time to repack.

-v
+
+--verbose +

In addition to the number of loose objects and disk @@ -309,7 +312,7 @@ them, to help you decide when it is a good time to repack.

diff --git a/git-count-objects.txt b/git-count-objects.txt index e1219b316..1ba85a259 100644 --- a/git-count-objects.txt +++ b/git-count-objects.txt @@ -18,6 +18,7 @@ them, to help you decide when it is a good time to repack. OPTIONS ------- -v:: +--verbose:: In addition to the number of loose objects and disk space consumed, it reports the number of in-pack objects, number of packs, and number of objects that can be diff --git a/git-cvsserver.html b/git-cvsserver.html index 888d469e3..d42dc0759 100644 --- a/git-cvsserver.html +++ b/git-cvsserver.html @@ -315,7 +315,10 @@ of allowed directories (see below) if you want to use this option.

---version, -V +-V +
+
+--version

@@ -323,7 +326,13 @@ Print version information and exit

---help, -h, -H +-h +
+
+-H +
+
+--help

@@ -726,7 +735,7 @@ Martin Langhoff <martin@catalyst.net.nz>

diff --git a/git-cvsserver.txt b/git-cvsserver.txt index b7721131d..3310ae25f 100644 --- a/git-cvsserver.txt +++ b/git-cvsserver.txt @@ -41,10 +41,13 @@ Don't allow recursing into subdirectories Don't check for `gitcvs.enabled` in config. You also have to specify a list of allowed directories (see below) if you want to use this option. ---version, -V:: +-V:: +--version:: Print version information and exit ---help, -h, -H:: +-h:: +-H:: +--help:: Print usage information and exit :: diff --git a/git-daemon.html b/git-daemon.html index fd555ea8e..0270c7372 100644 --- a/git-daemon.html +++ b/git-daemon.html @@ -421,7 +421,10 @@ git repositories.

---user-path, --user-path=path +--user-path +
+
+--user-path=path

@@ -470,7 +473,10 @@ git repositories.

---user=user, --group=group +--user=user +
+
+--group=group

@@ -485,7 +491,10 @@ the facility of inet daemon to achieve the same before spawning git-daemon if needed.

---enable=service, --disable=service +--enable=service +
+
+--disable=service

@@ -497,7 +506,10 @@ the facility of inet daemon to achieve the same before spawning

---allow-override=service, --forbid-override=service +--allow-override=service +
+
+--forbid-override=service

@@ -676,7 +688,7 @@ selectively enable/disable services per repository

diff --git a/git-daemon.txt b/git-daemon.txt index 3fb71d683..344f24ea5 100644 --- a/git-daemon.txt +++ b/git-daemon.txt @@ -103,7 +103,8 @@ OPTIONS Log to syslog instead of stderr. Note that this option does not imply --verbose, thus by default only error conditions will be logged. ---user-path, --user-path=path:: +--user-path:: +--user-path=path:: Allow ~user notation to be used in requests. When specified with no parameter, requests to git://host/~alice/foo is taken as a request to access @@ -127,7 +128,8 @@ OPTIONS Save the process id in 'file'. Ignored when the daemon is run under `--inetd`. ---user=user, --group=group:: +--user=user:: +--group=group:: Change daemon's uid and gid before entering the service loop. When only `--user` is given without `--group`, the primary group ID for the user is used. The values of @@ -138,14 +140,16 @@ Giving these options is an error when used with `--inetd`; use the facility of inet daemon to achieve the same before spawning `git-daemon` if needed. ---enable=service, --disable=service:: +--enable=service:: +--disable=service:: Enable/disable the service site-wide per default. Note that a service disabled site-wide can still be enabled per repository if it is marked overridable and the repository enables the service with an configuration item. ---allow-override=service, --forbid-override=service:: +--allow-override=service:: +--forbid-override=service:: Allow/forbid overriding the site-wide default with per repository configuration. By default, all the services are overridable. diff --git a/git-describe.html b/git-describe.html index c41c511bb..751808168 100644 --- a/git-describe.html +++ b/git-describe.html @@ -384,6 +384,14 @@ abbreviated object name of the most recent commit.

leaking private tags made from the repository).

+
+--always +
+
+

+ Show uniquely abbreviated commit object as fallback. +

+

EXAMPLES

@@ -462,7 +470,7 @@ updated by Shawn Pearce <spearce@spearce.org>.

diff --git a/git-describe.txt b/git-describe.txt index 3f0b7b2f4..9f6f48318 100644 --- a/git-describe.txt +++ b/git-describe.txt @@ -70,6 +70,9 @@ OPTIONS Only consider tags matching the given pattern (can be used to avoid leaking private tags made from the repository). +--always:: + Show uniquely abbreviated commit object as fallback. + EXAMPLES -------- diff --git a/git-diff-files.html b/git-diff-files.html index 5d0a4a7b9..4b0792b86 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -773,7 +773,10 @@ cleanly resolved paths. The option -0 can be given to omit diff output for unmerged entries and just show "Unmerged".

--c,--cc +-c +
+
+--cc

@@ -1288,7 +1291,7 @@ the pathname, but if that is NUL, the record will show two paths.

diff --git a/git-diff-files.txt b/git-diff-files.txt index ed9bd75b7..8a64869d2 100644 --- a/git-diff-files.txt +++ b/git-diff-files.txt @@ -30,7 +30,8 @@ The default is to diff against our branch (-2) and the cleanly resolved paths. The option -0 can be given to omit diff output for unmerged entries and just show "Unmerged". --c,--cc:: +-c:: +--cc:: This compares stage 2 (our branch), stage 3 (their branch) and the working tree file and outputs a combined diff, similar to the way 'diff-tree' shows a merge diff --git a/git-fetch-pack.html b/git-fetch-pack.html index b40b165a7..05d967ae4 100644 --- a/git-fetch-pack.html +++ b/git-fetch-pack.html @@ -299,7 +299,10 @@ have a common ancestor commit.

---quiet, \-q +-q +
+
+--quiet

@@ -308,7 +311,10 @@ have a common ancestor commit.

---keep, \-k +-k +
+
+--keep

@@ -380,7 +386,7 @@ have a common ancestor commit.

-\-v +-v

@@ -431,7 +437,7 @@ have a common ancestor commit.

diff --git a/git-fetch-pack.txt b/git-fetch-pack.txt index 6ee3dccc1..282fcaf17 100644 --- a/git-fetch-pack.txt +++ b/git-fetch-pack.txt @@ -28,30 +28,32 @@ have a common ancestor commit. OPTIONS ------- -\--all:: +--all:: Fetch all remote refs. -\--quiet, \-q:: +-q:: +--quiet:: Pass '-q' flag to 'git-unpack-objects'; this makes the cloning process less verbose. -\--keep, \-k:: +-k:: +--keep:: Do not invoke 'git-unpack-objects' on received data, but create a single packfile out of it instead, and store it in the object database. If provided twice then the pack is locked against repacking. -\--thin:: +--thin:: Spend extra cycles to minimize the number of objects to be sent. Use it on slower connection. -\--include-tag:: +--include-tag:: If the remote side supports it, annotated tags objects will be downloaded on the same connection as the other objects if the object the tag references is downloaded. The caller must otherwise determine the tags this option made available. -\--upload-pack=:: +--upload-pack=:: Use this to specify the path to 'git-upload-pack' on the remote side, if is not found on your $PATH. Installations of sshd ignores the user's environment @@ -63,16 +65,16 @@ OPTIONS shells by having a lean .bashrc file (they set most of the things up in .bash_profile). -\--exec=:: +--exec=:: Same as \--upload-pack=. -\--depth=:: +--depth=:: Limit fetching to ancestor-chains not longer than n. -\--no-progress:: +--no-progress:: Do not show the progress. -\-v:: +-v:: Run verbosely. :: diff --git a/git-fetch.html b/git-fetch.html index 62c0816d6..3f3acebdd 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -293,7 +293,10 @@ branches you are not interested in, you will not get them.

--q, --quiet +-q +
+
+--quiet

@@ -302,7 +305,10 @@ branches you are not interested in, you will not get them.

--v, --verbose +-v +
+
+--verbose

@@ -310,7 +316,10 @@ branches you are not interested in, you will not get them.

--a, --append +-a +
+
+--append

@@ -331,7 +340,10 @@ branches you are not interested in, you will not get them.

--f, --force +-f +
+
+--force

@@ -343,7 +355,10 @@ branches you are not interested in, you will not get them.

--n, --no-tags +-n +
+
+--no-tags

@@ -353,7 +368,10 @@ branches you are not interested in, you will not get them.

--t, --tags +-t +
+
+--tags

@@ -366,7 +384,10 @@ branches you are not interested in, you will not get them.

--k, --keep +-k +
+
+--keep

@@ -374,7 +395,10 @@ branches you are not interested in, you will not get them.

--u, --update-head-ok +-u +
+
+--update-head-ok

@@ -709,7 +733,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-filter-branch.html b/git-filter-branch.html index 7d1bff7b9..46e289f22 100644 --- a/git-filter-branch.html +++ b/git-filter-branch.html @@ -463,7 +463,10 @@ to other tags will be rewritten to point to the underlying commit.

--f|--force +-f +
+
+--force

@@ -614,7 +617,7 @@ and the git list <git@vger.kernel.org>

diff --git a/git-filter-branch.txt b/git-filter-branch.txt index 44060687a..ea77f1fce 100644 --- a/git-filter-branch.txt +++ b/git-filter-branch.txt @@ -161,7 +161,8 @@ to other tags will be rewritten to point to the underlying commit. does this in the '.git-rewrite/' directory but you can override that choice by this parameter. --f|--force:: +-f:: +--force:: `git filter-branch` refuses to start with an existing temporary directory or when there are already refs starting with 'refs/original/', unless forced. diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html index 105a3c7c3..962bc761f 100644 --- a/git-fmt-merge-msg.html +++ b/git-fmt-merge-msg.html @@ -307,7 +307,10 @@ automatically invoking git-merge.

---summary,--no-summary +--summary +
+
+--no-summary

@@ -316,7 +319,10 @@ automatically invoking git-merge.

---file <file>, -F <file> +-F <file> +
+
+--file <file>

@@ -367,7 +373,7 @@ merge.summary

diff --git a/git-fmt-merge-msg.txt b/git-fmt-merge-msg.txt index 328cc542d..2a7cfb980 100644 --- a/git-fmt-merge-msg.txt +++ b/git-fmt-merge-msg.txt @@ -33,11 +33,13 @@ OPTIONS Do not list one-line descriptions from the actual commits being merged. ---summary,--no-summary:: +--summary:: +--no-summary:: Synonyms to --log and --no-log; these are deprecated and will be removed in the future. ---file , -F :: +-F :: +--file :: Take the list of merged objects from instead of stdin. diff --git a/git-for-each-ref.html b/git-for-each-ref.html index b18396ad8..60bc12de7 100644 --- a/git-for-each-ref.html +++ b/git-for-each-ref.html @@ -339,7 +339,16 @@ host language allowing their direct evaluation in that language.

---shell, --perl, --python, --tcl +--shell +
+
+--perl +
+
+--python +
+
+--tcl

@@ -496,7 +505,7 @@ eval "$eval"

diff --git a/git-for-each-ref.txt b/git-for-each-ref.txt index 6325ff9a6..b347bfbb1 100644 --- a/git-for-each-ref.txt +++ b/git-for-each-ref.txt @@ -53,7 +53,10 @@ OPTIONS literally, in the latter case matching completely or from the beginning up to a slash. ---shell, --perl, --python, --tcl:: +--shell:: +--perl:: +--python:: +--tcl:: If given, strings that substitute `%(fieldname)` placeholders are quoted as string literals suitable for the specified host language. This is meant to produce diff --git a/git-format-patch.html b/git-format-patch.html index 2df918d8e..a9b84cf42 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -817,7 +817,10 @@ reference.

--o|--output-directory <dir> +-o <dir> +
+
+--output-directory <dir>

@@ -826,7 +829,10 @@ reference.

--n|--numbered +-n +
+
+--numbered

@@ -834,7 +840,10 @@ reference.

--N|--no-numbered +-N +
+
+--no-numbered

@@ -860,7 +869,10 @@ reference.

--k|--keep-subject +-k +
+
+--keep-subject

@@ -869,7 +881,10 @@ reference.

--s|--signoff +-s +
+
+--signoff

@@ -1088,7 +1103,7 @@ as e-mailable patches:

diff --git a/git-format-patch.txt b/git-format-patch.txt index cdee64206..4dafa39a9 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt @@ -74,14 +74,17 @@ include::diff-options.txt[] -:: Limits the number of patches to prepare. --o|--output-directory :: +-o :: +--output-directory :: Use to store the resulting files, instead of the current working directory. --n|--numbered:: +-n:: +--numbered:: Name output in '[PATCH n/m]' format. --N|--no-numbered:: +-N:: +--no-numbered:: Name output in '[PATCH]' format. --start-number :: @@ -92,11 +95,13 @@ include::diff-options.txt[] without the default first line of the commit appended. Mutually exclusive with the --stdout option. --k|--keep-subject:: +-k:: +--keep-subject:: Do not strip/add '[PATCH]' from the first line of the commit log message. --s|--signoff:: +-s:: +--signoff:: Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. diff --git a/git-grep.html b/git-grep.html index 3a9cee065..474a61e38 100644 --- a/git-grep.html +++ b/git-grep.html @@ -303,7 +303,10 @@ registered in the index file, or given tree objects.

--a | --text +-a +
+
+--text

@@ -311,7 +314,10 @@ registered in the index file, or given tree objects.

--i | --ignore-case +-i +
+
+--ignore-case

@@ -328,7 +334,10 @@ registered in the index file, or given tree objects.

--w | --word-regexp +-w +
+
+--word-regexp

@@ -338,7 +347,10 @@ registered in the index file, or given tree objects.

--v | --invert-match +-v +
+
+--invert-match

@@ -346,7 +358,10 @@ registered in the index file, or given tree objects.

--h | -H +-h +
+
+-H

@@ -369,7 +384,16 @@ registered in the index file, or given tree objects.

--E | --extended-regexp | -G | --basic-regexp +-E +
+
+--extended-regexp +
+
+-G +
+
+--basic-regexp

@@ -378,7 +402,10 @@ registered in the index file, or given tree objects.

--F | --fixed-strings +-F +
+
+--fixed-strings

@@ -395,7 +422,19 @@ registered in the index file, or given tree objects.

--l | --files-with-matches | --name-only | -L | --files-without-match +-l +
+
+--files-with-matches +
+
+--name-only +
+
+-L +
+
+--files-without-match

@@ -406,7 +445,10 @@ registered in the index file, or given tree objects.

--c | --count +-c +
+
+--count

@@ -453,7 +495,16 @@ registered in the index file, or given tree objects.

---and | --or | --not | ( | ) +--and +
+
+--or +
+
+--not +
+
+( … )

@@ -530,7 +581,7 @@ revamped by Junio C Hamano.

diff --git a/git-grep.txt b/git-grep.txt index 13b9cf770..1b646b73f 100644 --- a/git-grep.txt +++ b/git-grep.txt @@ -33,25 +33,30 @@ OPTIONS Instead of searching in the working tree files, check the blobs registered in the index file. --a | --text:: +-a:: +--text:: Process binary files as if they were text. --i | --ignore-case:: +-i:: +--ignore-case:: Ignore case differences between the patterns and the files. -I:: Don't match the pattern in binary files. --w | --word-regexp:: +-w:: +--word-regexp:: Match the pattern only at word boundary (either begin at the beginning of a line, or preceded by a non-word character; end at the end of a line or followed by a non-word character). --v | --invert-match:: +-v:: +--invert-match:: Select non-matching lines. --h | -H:: +-h:: +-H:: By default, the command shows the filename for each match. `-h` option is used to suppress this output. `-H` is there for completeness and does not do anything @@ -64,24 +69,33 @@ OPTIONS option forces paths to be output relative to the project top directory. --E | --extended-regexp | -G | --basic-regexp:: +-E:: +--extended-regexp:: +-G:: +--basic-regexp:: Use POSIX extended/basic regexp for patterns. Default is to use basic regexp. --F | --fixed-strings:: +-F:: +--fixed-strings:: Use fixed strings for patterns (don't interpret pattern as a regex). -n:: Prefix the line number to matching lines. --l | --files-with-matches | --name-only | -L | --files-without-match:: +-l:: +--files-with-matches:: +--name-only:: +-L:: +--files-without-match:: Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. For better compatibility with git-diff, --name-only is a synonym for --files-with-matches. --c | --count:: +-c:: +--count:: Instead of showing every matched line, show the number of lines that match. @@ -103,7 +117,10 @@ OPTIONS scripts passing user input to grep. Multiple patterns are combined by 'or'. ---and | --or | --not | ( | ):: +--and:: +--or:: +--not:: +( ... ):: Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all diff --git a/git-help.html b/git-help.html index 0fb3393ec..f46269f6d 100644 --- a/git-help.html +++ b/git-help.html @@ -291,7 +291,10 @@ former is internally converted into the latter.

--a|--all +-a +
+
+--all

@@ -300,7 +303,10 @@ former is internally converted into the latter.

--i|--info +-i +
+
+--info

@@ -309,7 +315,10 @@ former is internally converted into the latter.

--m|--man +-m +
+
+--man

@@ -322,7 +331,10 @@ but the man.viewer configuration variable may be used to choose other display programs (see below).

--w|--web +-w +
+
+--web

@@ -461,7 +473,7 @@ little. Maintenance is done by the git-list <git@vger.kernel.org>.

diff --git a/git-help.txt b/git-help.txt index 8994c6d43..faecd6bb9 100644 --- a/git-help.txt +++ b/git-help.txt @@ -28,15 +28,18 @@ former is internally converted into the latter. OPTIONS ------- --a|--all:: +-a:: +--all:: Prints all the available commands on the standard output. This option supersedes any other option. --i|--info:: +-i:: +--info:: Display manual page for the command in the 'info' format. The 'info' program will be used for that purpose. --m|--man:: +-m:: +--man:: Display manual page for the command in the 'man' format. This option may be used to override a value set in the 'help.format' configuration variable. @@ -45,7 +48,8 @@ By default the 'man' program will be used to display the manual page, but the 'man.viewer' configuration variable may be used to choose other display programs (see below). --w|--web:: +-w:: +--web:: Display manual page for the command in the 'web' (HTML) format. A web browser will be used for that purpose. + diff --git a/git-http-push.html b/git-http-push.html index c767a475d..7ba19b783 100644 --- a/git-http-push.html +++ b/git-http-push.html @@ -325,7 +325,10 @@ not to work and sometimes corrupts repository.

--d, -D +-d +
+
+-D

@@ -423,7 +426,7 @@ to disable the fast-forward check only on that ref.

diff --git a/git-http-push.txt b/git-http-push.txt index 143291d12..8d32a9204 100644 --- a/git-http-push.txt +++ b/git-http-push.txt @@ -40,7 +40,8 @@ OPTIONS Report the list of objects being walked locally and the list of objects successfully sent to the remote repository. --d, -D:: +-d:: +-D:: Remove from remote repository. The specified branch cannot be the remote HEAD. If -d is specified the following other conditions must also be met: diff --git a/git-init.html b/git-init.html index ab1e2ff8c..9540f5242 100644 --- a/git-init.html +++ b/git-init.html @@ -278,7 +278,10 @@ git-init(1) Manual Page
--q, --quiet +-q +
+
+--quiet

@@ -421,7 +424,7 @@ add all existing file to the index

diff --git a/git-init.txt b/git-init.txt index c48b615da..792643c80 100644 --- a/git-init.txt +++ b/git-init.txt @@ -16,7 +16,8 @@ OPTIONS -- --q, \--quiet:: +-q:: +--quiet:: Only print error and warning messages, all other output will be suppressed. diff --git a/git-instaweb.html b/git-instaweb.html index 68444075d..bb9bfd693 100644 --- a/git-instaweb.html +++ b/git-instaweb.html @@ -286,7 +286,10 @@ repository.

--l|--local +-l +
+
+--local

@@ -294,7 +297,10 @@ repository.

--d|--httpd +-d +
+
+--httpd

@@ -306,7 +312,10 @@ repository.

--m|--module-path +-m +
+
+--module-path

@@ -315,7 +324,10 @@ repository.

--p|--port +-p +
+
+--port

@@ -323,7 +335,10 @@ repository.

--b|--browser +-b +
+
+--browser

@@ -395,7 +410,7 @@ repository.

diff --git a/git-instaweb.txt b/git-instaweb.txt index 11e6a8177..7da5b8d9a 100644 --- a/git-instaweb.txt +++ b/git-instaweb.txt @@ -20,24 +20,29 @@ repository. OPTIONS ------- --l|--local:: +-l:: +--local:: Only bind the web server to the local IP (127.0.0.1). --d|--httpd:: +-d:: +--httpd:: The HTTP daemon command-line that will be executed. Command-line options may be specified here, and the configuration file will be added at the end of the command-line. Currently lighttpd, apache2 and webrick are supported. (Default: lighttpd) --m|--module-path:: +-m:: +--module-path:: The module path (only needed if httpd is Apache). (Default: /usr/lib/apache2/modules) --p|--port:: +-p:: +--port:: The port number to bind the httpd to. (Default: 1234) --b|--browser:: +-b:: +--browser:: The web browser that should be used to view the gitweb page. This will be passed to the 'git-web--browse' helper script along with the URL of the gitweb instance. See diff --git a/git-log.html b/git-log.html index 16f650174..4154c626e 100644 --- a/git-log.html +++ b/git-log.html @@ -1002,7 +1002,10 @@ special notations explained in the description, additional commit limiting may be applied.

--n number, --max-count=number +-n number +
+
+--max-count=number

@@ -1018,7 +1021,10 @@ limiting may be applied.

---since=date, --after=date +--since=date +
+
+--after=date

@@ -1026,7 +1032,10 @@ limiting may be applied.

---until=date, --before=date +--until=date +
+
+--before=date

@@ -1034,7 +1043,10 @@ limiting may be applied.

---author=pattern, --committer=pattern +--author=pattern +
+
+--committer=pattern

@@ -1052,7 +1064,10 @@ limiting may be applied.

--i, --regexp-ignore-case +-i +
+
+--regexp-ignore-case

@@ -1060,7 +1075,10 @@ limiting may be applied.

--E, --extended-regexp +-E +
+
+--extended-regexp

@@ -1069,7 +1087,10 @@ limiting may be applied.

--F, --fixed-strings +-F +
+
+--fixed-strings

@@ -1155,7 +1176,10 @@ excluded from the output.

--g, --walk-reflogs +-g +
+
+--walk-reflogs

@@ -1193,7 +1217,10 @@ See also git-reflog(1).

---dense, --sparse +--dense +
+
+--sparse

@@ -1913,7 +1940,7 @@ reversible operation.

diff --git a/git-ls-files.html b/git-ls-files.html index c30160f05..0c873b868 100644 --- a/git-ls-files.html +++ b/git-ls-files.html @@ -295,7 +295,10 @@ shown:

--c|--cached +-c +
+
+--cached

@@ -303,7 +306,10 @@ shown:

--d|--deleted +-d +
+
+--deleted

@@ -311,7 +317,10 @@ shown:

--m|--modified +-m +
+
+--modified

@@ -319,7 +328,10 @@ shown:

--o|--others +-o +
+
+--others

@@ -327,7 +339,10 @@ shown:

--i|--ignored +-i +
+
+--ignored

@@ -336,7 +351,10 @@ shown:

--s|--stage +-s +
+
+--stage

@@ -361,7 +379,10 @@ shown:

--u|--unmerged +-u +
+
+--unmerged

@@ -369,7 +390,10 @@ shown:

--k|--killed +-k +
+
+--killed

@@ -387,7 +411,10 @@ shown:

--x|--exclude=<pattern> +-x <pattern> +
+
+--exclude=<pattern>

@@ -396,7 +423,10 @@ shown:

--X|--exclude-from=<file> +-X <file> +
+
+--exclude-from=<file>

@@ -626,7 +656,7 @@ pattern file appears in.

diff --git a/git-ls-files.txt b/git-ls-files.txt index 1b0b21224..560594e25 100644 --- a/git-ls-files.txt +++ b/git-ls-files.txt @@ -30,23 +30,29 @@ shown: OPTIONS ------- --c|--cached:: +-c:: +--cached:: Show cached files in the output (default) --d|--deleted:: +-d:: +--deleted:: Show deleted files in the output --m|--modified:: +-m:: +--modified:: Show modified files in the output --o|--others:: +-o:: +--others:: Show other files in the output --i|--ignored:: +-i:: +--ignored:: Show ignored files in the output. Note that this also reverses any exclude list present. --s|--stage:: +-s:: +--stage:: Show stage files in the output --directory:: @@ -56,10 +62,12 @@ OPTIONS --no-empty-directory:: Do not list empty directories. Has no effect without --directory. --u|--unmerged:: +-u:: +--unmerged:: Show unmerged files in the output (forces --stage) --k|--killed:: +-k:: +--killed:: Show files on the filesystem that need to be removed due to file/directory conflicts for checkout-index to succeed. @@ -67,11 +75,13 @@ OPTIONS -z:: \0 line termination on output. --x|--exclude=:: +-x :: +--exclude=:: Skips files matching pattern. Note that pattern is a shell wildcard pattern. --X|--exclude-from=:: +-X :: +--exclude-from=:: exclude patterns are read from ; 1 per line. --exclude-per-directory=:: diff --git a/git-ls-remote.html b/git-ls-remote.html index d3b816e12..5253d8dea 100644 --- a/git-ls-remote.html +++ b/git-ls-remote.html @@ -285,7 +285,16 @@ commit IDs.

--h|--heads, -t|--tags +-h +
+
+--heads +
+
+-t +
+
+--tags

@@ -296,7 +305,10 @@ commit IDs.

--u <exec>, --upload-pack=<exec> +-u <exec> +
+
+--upload-pack=<exec>

@@ -361,7 +373,7 @@ c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2

diff --git a/git-ls-remote.txt b/git-ls-remote.txt index 8ad7a94f9..f92f3ca18 100644 --- a/git-ls-remote.txt +++ b/git-ls-remote.txt @@ -20,13 +20,17 @@ commit IDs. OPTIONS ------- --h|--heads, -t|--tags:: +-h:: +--heads:: +-t:: +--tags:: Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed. --u , --upload-pack=:: +-u :: +--upload-pack=:: Specify the full path of linkgit:git-upload-pack[1] on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the diff --git a/git-merge.html b/git-merge.html index 198144f37..68420e3db 100644 --- a/git-merge.html +++ b/git-merge.html @@ -298,7 +298,10 @@ new scripts. It is the same as git merge -m <msg> <remote>

--n, --no-stat +-n +
+
+--no-stat

@@ -306,7 +309,10 @@ new scripts. It is the same as git merge -m <msg> <remote>

---summary, --no-summary +--summary +
+
+--no-summary

@@ -395,7 +401,10 @@ new scripts. It is the same as git merge -m <msg> <remote>

--s <strategy>, --strategy=<strategy> +-s <strategy> +
+
+--strategy=<strategy>

@@ -749,7 +758,7 @@ Resolve the conflicts. git-diff would report only the

diff --git a/git-mv.html b/git-mv.html index 97ddb91b3..7b9b61632 100644 --- a/git-mv.html +++ b/git-mv.html @@ -312,7 +312,10 @@ committed.

--n, --dry-run +-n +
+
+--dry-run

@@ -337,7 +340,7 @@ Move functionality added by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>

diff --git a/git-mv.txt b/git-mv.txt index fb485de2c..339190600 100644 --- a/git-mv.txt +++ b/git-mv.txt @@ -34,7 +34,8 @@ OPTIONS condition. An error happens when a source is neither existing nor controlled by GIT, or when it would overwrite an existing file unless '-f' is given. --n, \--dry-run:: +-n:: +--dry-run:: Do nothing; only show what would happen diff --git a/git-name-rev.html b/git-name-rev.html index 28b7b0824..e85db1b82 100644 --- a/git-name-rev.html +++ b/git-name-rev.html @@ -329,6 +329,23 @@ format parsable by git-rev-parse.

cannot be combined with --stdin.

+
+--no-undefined +
+
+

+ Die with error code != 0 when a reference is undefined, + instead of printing undefined. +

+
+
+--always +
+
+

+ Show uniquely abbreviated commit object as fallback. +

+

EXAMPLE

@@ -364,7 +381,7 @@ not the context.

diff --git a/git-name-rev.txt b/git-name-rev.txt index 12784d737..ffac3f8f5 100644 --- a/git-name-rev.txt +++ b/git-name-rev.txt @@ -41,6 +41,13 @@ OPTIONS of linkgit:git-describe[1] more closely. This option cannot be combined with --stdin. +--no-undefined:: + Die with error code != 0 when a reference is undefined, + instead of printing `undefined`. + +--always:: + Show uniquely abbreviated commit object as fallback. + EXAMPLE ------- diff --git a/git-pack-objects.html b/git-pack-objects.html index dc7108277..12673e8ff 100644 --- a/git-pack-objects.html +++ b/git-pack-objects.html @@ -369,7 +369,10 @@ base-name

---window=[N], --depth=[N] +--window=[N] +
+
+--depth=[N]

@@ -577,7 +580,7 @@ base-name

diff --git a/git-pack-objects.txt b/git-pack-objects.txt index d5a87effa..f4d8d68e3 100644 --- a/git-pack-objects.txt +++ b/git-pack-objects.txt @@ -79,7 +79,8 @@ base-name:: reference was included in the resulting packfile. This can be useful to send new tags to native git clients. ---window=[N], --depth=[N]:: +--window=[N]:: +--depth=[N]:: These two options affect how the objects contained in the pack are stored using delta compression. The objects are first internally sorted by type, size and diff --git a/git-pack-refs.html b/git-pack-refs.html index 322268295..007dc0763 100644 --- a/git-pack-refs.html +++ b/git-pack-refs.html @@ -336,7 +336,7 @@ hierarchy after packing them. This option tells it not to. diff --git a/git-pack-refs.txt b/git-pack-refs.txt index fa4868137..c0718468d 100644 --- a/git-pack-refs.txt +++ b/git-pack-refs.txt @@ -42,7 +42,7 @@ unpacked. OPTIONS ------- -\--all:: +--all:: The command by default packs all tags and refs that are already packed, and leaves other refs @@ -51,7 +51,7 @@ developed and packing their tips does not help performance. This option causes branch tips to be packed as well. Useful for a repository with many branches of historical interests. -\--no-prune:: +--no-prune:: The command usually removes loose refs under `$GIT_DIR/refs` hierarchy after packing them. This option tells it not to. diff --git a/git-peek-remote.html b/git-peek-remote.html index 06041b53e..f2c5f24be 100644 --- a/git-peek-remote.html +++ b/git-peek-remote.html @@ -332,7 +332,7 @@ git-peek-remote(1) Manual Page diff --git a/git-peek-remote.txt b/git-peek-remote.txt index 56be1b611..ffbf93a79 100644 --- a/git-peek-remote.txt +++ b/git-peek-remote.txt @@ -16,7 +16,7 @@ This command is deprecated; use `git-ls-remote` instead. OPTIONS ------- -\--upload-pack=:: +--upload-pack=:: Use this to specify the path to 'git-upload-pack' on the remote side, if it is not found on your $PATH. Some installations of sshd ignores the user's environment diff --git a/git-prune.html b/git-prune.html index 524479ab3..41b269304 100644 --- a/git-prune.html +++ b/git-prune.html @@ -373,7 +373,7 @@ git-fsck's --unreachable option.

diff --git a/git-prune.txt b/git-prune.txt index 7283d07a0..ec335d6fa 100644 --- a/git-prune.txt +++ b/git-prune.txt @@ -37,7 +37,7 @@ OPTIONS \--:: Do not interpret any more arguments as options. -\--expire
--n, --no-stat +-n +
+
+--no-stat

@@ -306,7 +309,10 @@ when merging local branches into the current branch.

---summary, --no-summary +--summary +
+
+--no-summary

@@ -395,7 +401,10 @@ when merging local branches into the current branch.

--s <strategy>, --strategy=<strategy> +-s <strategy> +
+
+--strategy=<strategy>

@@ -434,7 +443,10 @@ unless you have read git-rebase(1) carefully.

--q, --quiet +-q +
+
+--quiet

@@ -443,7 +455,10 @@ unless you have read git-rebase(1) carefully.

--v, --verbose +-v +
+
+--verbose

@@ -451,7 +466,10 @@ unless you have read git-rebase(1) carefully.

--a, --append +-a +
+
+--append

@@ -472,7 +490,10 @@ unless you have read git-rebase(1) carefully.

--f, --force +-f +
+
+--force

@@ -494,7 +515,10 @@ unless you have read git-rebase(1) carefully.

--t, --tags +-t +
+
+--tags

@@ -507,7 +531,10 @@ unless you have read git-rebase(1) carefully.

--k, --keep +-k +
+
+--keep

@@ -515,7 +542,10 @@ unless you have read git-rebase(1) carefully.

--u, --update-head-ok +-u +
+
+--update-head-ok

@@ -1065,7 +1095,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

diff --git a/git-pull.txt b/git-pull.txt index 5c522ced9..5f55f6494 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -30,7 +30,7 @@ include::merge-options.txt[] :git-pull: 1 -\--rebase:: +--rebase:: Instead of a merge, perform a rebase after fetching. If there is a remote ref for the upstream branch, and this branch was rebased since last fetched, the rebase uses that information @@ -43,8 +43,8 @@ It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully. -\--no-rebase:: - Override earlier \--rebase. +--no-rebase:: + Override earlier --rebase. include::fetch-options.txt[] diff --git a/git-push.html b/git-push.html index 3150c2359..156bd35a1 100644 --- a/git-push.html +++ b/git-push.html @@ -389,7 +389,10 @@ nor in any Push line of the corresponding remotes file---see below).

--f, --force +-f +
+
+--force

@@ -409,7 +412,10 @@ nor in any Push line of the corresponding remotes file---see below).

---thin, --no-thin +--thin +
+
+--no-thin

@@ -419,7 +425,10 @@ nor in any Push line of the corresponding remotes file---see below).

--v, --verbose +-v +
+
+--verbose

@@ -759,7 +768,7 @@ by Linus Torvalds <torvalds@osdl.org>

diff --git a/git-push.txt b/git-push.txt index 9d8c37971..89e0049bc 100644 --- a/git-push.txt +++ b/git-push.txt @@ -61,11 +61,11 @@ already exists on the remote side. This is the default operation mode if no explicit refspec is found (that is neither on the command line nor in any Push line of the corresponding remotes file---see below). -\--all:: +--all:: Instead of naming each ref to push, specifies that all refs under `$GIT_DIR/refs/heads/` be pushed. -\--mirror:: +--mirror:: Instead of naming each ref to push, specifies that all refs under `$GIT_DIR/refs/heads/` and `$GIT_DIR/refs/tags/` be mirrored to the remote repository. Newly created local @@ -75,39 +75,42 @@ nor in any Push line of the corresponding remotes file---see below). if the configuration option `remote..mirror` is set. -\--dry-run:: +--dry-run:: Do everything except actually send the updates. -\--tags:: +--tags:: All refs under `$GIT_DIR/refs/tags` are pushed, in addition to refspecs explicitly listed on the command line. -\--receive-pack=:: +--receive-pack=:: Path to the 'git-receive-pack' program on the remote end. Sometimes useful when pushing to a remote repository over ssh, and you do not have the program in a directory on the default $PATH. -\--exec=:: +--exec=:: Same as \--receive-pack=. --f, \--force:: +-f:: +--force:: Usually, the command refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it. This flag disables the check. This can cause the remote repository to lose commits; use it with care. -\--repo=:: +--repo=:: When no repository is specified the command defaults to "origin"; this overrides it. -\--thin, \--no-thin:: +--thin:: +--no-thin:: These options are passed to `git-send-pack`. Thin transfer spends extra cycles to minimize the number of objects to be sent and meant to be used on slower connection. --v, \--verbose:: +-v:: +--verbose:: Run verbosely. include::urls-remotes.txt[] diff --git a/git-quiltimport.html b/git-quiltimport.html index f14a8f112..719f1e376 100644 --- a/git-quiltimport.html +++ b/git-quiltimport.html @@ -292,6 +292,9 @@ preserved as the 1 line subject in the git description.

+-n +
+
--dry-run
@@ -339,7 +342,7 @@ variable.

diff --git a/git-quiltimport.txt b/git-quiltimport.txt index d0bc182c7..060037939 100644 --- a/git-quiltimport.txt +++ b/git-quiltimport.txt @@ -29,6 +29,8 @@ preserved as the 1 line subject in the git description. OPTIONS ------- + +-n:: --dry-run:: Walk through the patches in the series and warn if we cannot find all of the necessary information to commit diff --git a/git-rebase.html b/git-rebase.html index d8ac7ea28..c12560270 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -492,7 +492,10 @@ desired resolution, you can continue the rebasing process with

--m, --merge +-m +
+
+--merge

@@ -502,7 +505,10 @@ desired resolution, you can continue the rebasing process with

--s <strategy>, --strategy=<strategy> +-s <strategy> +
+
+--strategy=<strategy>

@@ -514,7 +520,10 @@ desired resolution, you can continue the rebasing process with

--v, --verbose +-v +
+
+--verbose

@@ -542,7 +551,10 @@ desired resolution, you can continue the rebasing process with

--i, --interactive +-i +
+
+--interactive

@@ -552,7 +564,10 @@ desired resolution, you can continue the rebasing process with

--p, --preserve-merges +-p +
+
+--preserve-merges

@@ -843,7 +858,7 @@ Johannes E. Schindelin <johannes.schindelin@gmx.de>

diff --git a/git-rebase.txt b/git-rebase.txt index cc48beec7..716641435 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -213,19 +213,22 @@ OPTIONS --skip:: Restart the rebasing process by skipping the current patch. --m, \--merge:: +-m:: +--merge:: Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. --s , \--strategy=:: +-s :: +--strategy=:: Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies is used instead (`git-merge-recursive` when merging a single head, `git-merge-octopus` otherwise). This implies --merge. --v, \--verbose:: +-v:: +--verbose:: Display a diffstat of what changed upstream since the last rebase. -C:: @@ -238,12 +241,14 @@ OPTIONS This flag is passed to the `git-apply` program (see linkgit:git-apply[1]) that applies the patch. --i, \--interactive:: +-i:: +--interactive:: Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below). --p, \--preserve-merges:: +-p:: +--preserve-merges:: Instead of ignoring merges, try to recreate them. This option only works in interactive mode. diff --git a/git-remote.html b/git-remote.html index 60c6b7486..845cd5605 100644 --- a/git-remote.html +++ b/git-remote.html @@ -273,7 +273,7 @@ git-remote(1) Manual Page

SYNOPSIS

-
git-remote +
git-remote [-v | --verbose] git-remote add [-t <branch>] [-m <master>] [-f] [--mirror] <name> <url> git-remote rm <name> git-remote show <name> @@ -284,6 +284,22 @@ git-remote(1) Manual Page

Manage the set of repositories ("remotes") whose branches you track.

+

OPTIONS

+
+
+
+-v +
+
+--verbose +
+
+

+ Be a little more verbose and show remote url after name. +

+
+
+

COMMANDS

With no arguments, shows a list of existing remotes. Several @@ -430,7 +446,7 @@ $ git merge origin

diff --git a/git-remote.txt b/git-remote.txt index e97dc0929..782b0554c 100644 --- a/git-remote.txt +++ b/git-remote.txt @@ -9,7 +9,7 @@ git-remote - manage set of tracked repositories SYNOPSIS -------- [verse] -'git-remote' +'git-remote' [-v | --verbose] 'git-remote' add [-t ] [-m ] [-f] [--mirror] 'git-remote' rm 'git-remote' show @@ -22,6 +22,14 @@ DESCRIPTION Manage the set of repositories ("remotes") whose branches you track. +OPTIONS +------- + +-v:: +--verbose:: + Be a little more verbose and show remote url after name. + + COMMANDS -------- diff --git a/git-repack.html b/git-repack.html index 54690eec9..b6dab0982 100644 --- a/git-repack.html +++ b/git-repack.html @@ -370,7 +370,10 @@ engines, disk storage, etc.

---window=[N], --depth=[N] +--window=[N] +
+
+--depth=[N]

@@ -443,7 +446,7 @@ that way can try to use older git with it).

diff --git a/git-repack.txt b/git-repack.txt index 793dccaa9..04d6f1fbc 100644 --- a/git-repack.txt +++ b/git-repack.txt @@ -73,7 +73,8 @@ OPTIONS this repository (or a direct copy of it) over HTTP or FTP. See gitlink:git-update-server-info[1]. ---window=[N], --depth=[N]:: +--window=[N]:: +--depth=[N]:: These two options affect how the objects contained in the pack are stored using delta compression. The objects are first internally sorted by type, size and optionally names and compared against the diff --git a/git-rev-list.html b/git-rev-list.html index f462ca9ec..66afe2b69 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -541,7 +541,10 @@ special notations explained in the description, additional commit limiting may be applied.

--n number, --max-count=number +-n number +
+
+--max-count=number

@@ -557,7 +560,10 @@ limiting may be applied.

---since=date, --after=date +--since=date +
+
+--after=date

@@ -565,7 +571,10 @@ limiting may be applied.

---until=date, --before=date +--until=date +
+
+--before=date

@@ -573,7 +582,10 @@ limiting may be applied.

---max-age=timestamp, --min-age=timestamp +--max-age=timestamp +
+
+--min-age=timestamp

@@ -581,7 +593,10 @@ limiting may be applied.

---author=pattern, --committer=pattern +--author=pattern +
+
+--committer=pattern

@@ -599,7 +614,10 @@ limiting may be applied.

--i, --regexp-ignore-case +-i +
+
+--regexp-ignore-case

@@ -607,7 +625,10 @@ limiting may be applied.

--E, --extended-regexp +-E +
+
+--extended-regexp

@@ -616,7 +637,10 @@ limiting may be applied.

--F, --fixed-strings +-F +
+
+--fixed-strings

@@ -723,7 +747,10 @@ excluded from the output.

--g, --walk-reflogs +-g +
+
+--walk-reflogs

@@ -761,7 +788,10 @@ See also git-reflog(1).

---dense, --sparse +--dense +
+
+--sparse

@@ -1225,7 +1255,7 @@ and the git-list <git@vger.kernel.org>.

diff --git a/git-rev-parse.html b/git-rev-parse.html index b53260b08..c1a454061 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -356,7 +356,10 @@ distinguish between them.

--q, --quiet +-q +
+
+--quiet

@@ -498,7 +501,10 @@ distinguish between them.

---short, --short=number +--short +
+
+--short=number

@@ -508,7 +514,10 @@ distinguish between them.

---since=datestring, --after=datestring +--since=datestring +
+
+--after=datestring

@@ -517,7 +526,10 @@ distinguish between them.

---until=datestring, --before=datestring +--until=datestring +
+
+--before=datestring

@@ -901,7 +913,7 @@ Junio C Hamano <junkio@cox.net> and Pierre Habouzit <madcoder@debian.or

diff --git a/git-rev-parse.txt b/git-rev-parse.txt index a0ef1fd55..9e273bc5a 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt @@ -52,7 +52,8 @@ OPTIONS The parameter given must be usable as a single, valid object name. Otherwise barf and abort. --q, --quiet:: +-q:: +--quiet:: Only meaningful in `--verify` mode. Do not output an error message if the first argument is not a valid object name; instead exit with non-zero status silently. @@ -119,16 +120,19 @@ OPTIONS --is-bare-repository:: When the repository is bare print "true", otherwise "false". ---short, --short=number:: +--short:: +--short=number:: Instead of outputting the full SHA1 values of object names try to abbreviate them to a shorter unique name. When no length is specified 7 is used. The minimum length is 4. ---since=datestring, --after=datestring:: +--since=datestring:: +--after=datestring:: Parses the date string, and outputs corresponding --max-age= parameter for git-rev-list command. ---until=datestring, --before=datestring:: +--until=datestring:: +--before=datestring:: Parses the date string, and outputs corresponding --min-age= parameter for git-rev-list command. diff --git a/git-revert.html b/git-revert.html index c167cd5eb..0766f143d 100644 --- a/git-revert.html +++ b/git-revert.html @@ -294,7 +294,10 @@ modifications from the HEAD commit).

--e|--edit +-e +
+
+--edit

@@ -304,7 +307,10 @@ modifications from the HEAD commit).

--m parent-number|--mainline parent-number +-m parent-number +
+
+--mainline parent-number

@@ -325,7 +331,10 @@ modifications from the HEAD commit).

--n|--no-commit +-n +
+
+--no-commit

@@ -342,7 +351,10 @@ modifications from the HEAD commit).

effect to your working tree in a row.

--s|--signoff +-s +
+
+--signoff

@@ -365,7 +377,7 @@ effect to your working tree in a row.

diff --git a/git-revert.txt b/git-revert.txt index 5e6adfcea..5b49b8138 100644 --- a/git-revert.txt +++ b/git-revert.txt @@ -22,12 +22,14 @@ OPTIONS For a more complete list of ways to spell commit names, see "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1]. --e|--edit:: +-e:: +--edit:: With this option, `git-revert` will let you edit the commit message prior to committing the revert. This is the default if you run the command from a terminal. --m parent-number|--mainline parent-number:: +-m parent-number:: +--mainline parent-number:: Usually you cannot revert a merge because you do not know which side of the merge should be considered the mainline. This option specifies the parent number (starting from 1) of @@ -38,7 +40,8 @@ OPTIONS With this option, `git-revert` will not start the commit message editor. --n|--no-commit:: +-n:: +--no-commit:: Usually the command automatically creates a commit with a commit log message stating which commit was reverted. This flag applies the change necessary to revert the @@ -51,7 +54,8 @@ OPTIONS This is useful when reverting more than one commits' effect to your working tree in a row. --s|--signoff:: +-s:: +--signoff:: Add Signed-off-by line at the end of the commit message. diff --git a/git-rm.html b/git-rm.html index 9855a972f..ceac28720 100644 --- a/git-rm.html +++ b/git-rm.html @@ -314,7 +314,10 @@ allowing the file to be removed from just the index.

--n, --dry-run +-n +
+
+--dry-run

@@ -361,7 +364,10 @@ allowing the file to be removed from just the index.

--q, --quiet +-q +
+
+--quiet

@@ -427,7 +433,7 @@ git-rm -f git-*.sh

diff --git a/git-rm.txt b/git-rm.txt index da3fe5913..d88554bed 100644 --- a/git-rm.txt +++ b/git-rm.txt @@ -38,7 +38,8 @@ OPTIONS -f:: Override the up-to-date check. --n, \--dry-run:: +-n:: +--dry-run:: Don't actually remove any file(s). Instead, just show if they exist in the index and would otherwise be removed by the command. @@ -52,15 +53,16 @@ OPTIONS the list of files, (useful when filenames might be mistaken for command-line options). -\--cached:: +--cached:: Use this option to unstage and remove paths only from the index. Working tree files, whether modified or not, will be left alone. -\--ignore-unmatch:: +--ignore-unmatch:: Exit with a zero status even if no files matched. --q, \--quiet:: +-q:: +--quiet:: git-rm normally outputs one line (in the form of an "rm" command) for each file removed. This option suppresses that output. diff --git a/git-send-email.html b/git-send-email.html index 49964cdf1..934d29496 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -315,7 +315,10 @@ enabled interface to provide the necessary information.

---chain-reply-to, --no-chain-reply-to +--chain-reply-to +
+
+--no-chain-reply-to

@@ -360,7 +363,10 @@ enabled interface to provide the necessary information.

---signed-off-by-cc, --no-signed-off-by-cc +--signed-off-by-cc +
+
+--no-signed-off-by-cc

@@ -490,7 +496,10 @@ user is prompted for a password while the input is masked for privacy.

---suppress-from, --no-suppress-from +--suppress-from +
+
+--no-suppress-from

@@ -516,7 +525,10 @@ user is prompted for a password while the input is masked for privacy.

---thread, --no-thread +--thread +
+
+--no-thread

@@ -685,7 +697,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.

diff --git a/git-send-email.txt b/git-send-email.txt index a29583796..251d661af 100644 --- a/git-send-email.txt +++ b/git-send-email.txt @@ -40,7 +40,8 @@ The --cc option must be repeated for each user you want on the cc list. Output of this command must be single email address per line. Default is the value of 'sendemail.cccmd' configuration value. ---chain-reply-to, --no-chain-reply-to:: +--chain-reply-to:: +--no-chain-reply-to:: If this is set, each email will be sent as a reply to the previous email sent. If disabled with "--no-chain-reply-to", all emails after the first will be sent as replies to the first email sent. When using @@ -65,7 +66,8 @@ The --cc option must be repeated for each user you want on the cc list. Only necessary if --compose is also set. If --compose is not set, this will be prompted for. ---signed-off-by-cc, --no-signed-off-by-cc:: +--signed-off-by-cc:: +--no-signed-off-by-cc:: If this is set, add emails found in Signed-off-by: or Cc: lines to the cc list. Default is the value of 'sendemail.signedoffcc' configuration value; @@ -141,7 +143,8 @@ user is prompted for a password while the input is masked for privacy. Only necessary if --compose is also set. If --compose is not set, this will be prompted for. ---suppress-from, --no-suppress-from:: +--suppress-from:: +--no-suppress-from:: If this is set, do not add the From: address to the cc: list. Default is the value of 'sendemail.suppressfrom' configuration value; if that is unspecified, default to --no-suppress-from. @@ -157,7 +160,8 @@ user is prompted for a password while the input is masked for privacy. if that is unspecified, default to 'self' if --suppress-from is specified, as well as 'sob' if --no-signed-off-cc is specified. ---thread, --no-thread:: +--thread:: +--no-thread:: If this is set, the In-Reply-To header will be set on each email sent. If disabled with "--no-thread", no emails will have the In-Reply-To header set. diff --git a/git-send-pack.html b/git-send-pack.html index 39e272068..4de169703 100644 --- a/git-send-pack.html +++ b/git-send-pack.html @@ -453,7 +453,7 @@ to disable the fast-forward check only on that ref.

diff --git a/git-send-pack.txt b/git-send-pack.txt index 850c351dc..ba2fdaec0 100644 --- a/git-send-pack.txt +++ b/git-send-pack.txt @@ -21,33 +21,33 @@ updates it from the current repository, sending named refs. OPTIONS ------- -\--receive-pack=:: +--receive-pack=:: Path to the 'git-receive-pack' program on the remote end. Sometimes useful when pushing to a remote repository over ssh, and you do not have the program in a directory on the default $PATH. -\--exec=:: +--exec=:: Same as \--receive-pack=. -\--all:: +--all:: Instead of explicitly specifying which refs to update, update all heads that locally exist. -\--dry-run:: +--dry-run:: Do everything except actually send the updates. -\--force:: +--force:: Usually, the command refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it. This flag disables the check. What this means is that the remote repository can lose commits; use it with care. -\--verbose:: +--verbose:: Run verbosely. -\--thin:: +--thin:: Spend extra cycles to minimize the number of objects to be sent. Use it on slower connection. diff --git a/git-shortlog.html b/git-shortlog.html index d9706e962..80b7a62e3 100644 --- a/git-shortlog.html +++ b/git-shortlog.html @@ -287,7 +287,10 @@ the first line of the commit message will be shown.

--h, --help +-h +
+
+--help

@@ -295,7 +298,10 @@ the first line of the commit message will be shown.

--n, --numbered +-n +
+
+--numbered

@@ -304,7 +310,10 @@ the first line of the commit message will be shown.

--s, --summary +-s +
+
+--summary

@@ -312,7 +321,10 @@ the first line of the commit message will be shown.

--e, --email +-e +
+
+--email

@@ -359,7 +371,7 @@ Eve Jones <eve@laptop.(none)>

diff --git a/git-shortlog.txt b/git-shortlog.txt index 5079b568e..daa64d4d8 100644 --- a/git-shortlog.txt +++ b/git-shortlog.txt @@ -22,17 +22,21 @@ Additionally, "[PATCH]" will be stripped from the commit description. OPTIONS ------- --h, \--help:: +-h:: +--help:: Print a short usage message and exit. --n, \--numbered:: +-n:: +--numbered:: Sort output according to the number of commits per author instead of author alphabetic order. --s, \--summary:: +-s:: +--summary:: Suppress commit description and provide a commit count summary only. --e, \--email:: +-e:: +--email:: Show the email address of each author. -w[[,[,]]]:: diff --git a/git-show-branch.html b/git-show-branch.html index f44f0ddbd..df757cf02 100644 --- a/git-show-branch.html +++ b/git-show-branch.html @@ -311,7 +311,10 @@ no <rev> nor <glob> is given on the command line.

--r|--remotes +-r +
+
+--remotes

@@ -319,7 +322,10 @@ no <rev> nor <glob> is given on the command line.

--a|--all +-a +
+
+--all

@@ -521,7 +527,7 @@ topologically related with each other.

diff --git a/git-show-branch.txt b/git-show-branch.txt index 32595ad54..de9e8f885 100644 --- a/git-show-branch.txt +++ b/git-show-branch.txt @@ -38,10 +38,12 @@ OPTIONS branches under $GIT_DIR/refs/heads/topic, giving `topic/*` would show all of them. --r|--remotes:: +-r:: +--remotes:: Show the remote-tracking branches. --a|--all:: +-a:: +--all:: Show both remote-tracking branches and local branches. --current:: diff --git a/git-show-ref.html b/git-show-ref.html index 1a11c8dbb..5c3f663c4 100644 --- a/git-show-ref.html +++ b/git-show-ref.html @@ -292,7 +292,10 @@ in the .git directory.

--h, --head +-h +
+
+--head

@@ -300,7 +303,10 @@ in the .git directory.

---tags, --heads +--tags +
+
+--heads

@@ -310,7 +316,10 @@ in the .git directory.

--d, --dereference +-d +
+
+--dereference

@@ -319,7 +328,10 @@ in the .git directory.

--s, --hash +-s +
+
+--hash

@@ -338,7 +350,10 @@ in the .git directory.

---abbrev, --abbrev=len +--abbrev +
+
+--abbrev=len

@@ -347,7 +362,10 @@ in the .git directory.

--q, --quiet +-q +
+
+--quiet

@@ -356,7 +374,10 @@ in the .git directory.

---exclude-existing, --exclude-existing=pattern +--exclude-existing +
+
+--exclude-existing=pattern

@@ -460,7 +481,7 @@ Man page by Jonas Fonseca <fonseca@diku.dk>.

diff --git a/git-show-ref.txt b/git-show-ref.txt index a85332c36..6b99529b6 100644 --- a/git-show-ref.txt +++ b/git-show-ref.txt @@ -29,22 +29,26 @@ in the `.git` directory. OPTIONS ------- --h, --head:: +-h:: +--head:: Show the HEAD reference. ---tags, --heads:: +--tags:: +--heads:: Limit to only "refs/heads" and "refs/tags", respectively. These options are not mutually exclusive; when given both, references stored in "refs/heads" and "refs/tags" are displayed. --d, --dereference:: +-d:: +--dereference:: Dereference tags into object IDs as well. They will be shown with "^{}" appended. --s, --hash:: +-s:: +--hash:: Only show the SHA1 hash, not the reference name. When also using --dereference the dereferenced tag will still be shown after the SHA1. @@ -55,17 +59,20 @@ OPTIONS Aside from returning an error code of 1, it will also print an error message if '--quiet' was not specified. ---abbrev, --abbrev=len:: +--abbrev:: +--abbrev=len:: Abbreviate the object name. When using `--hash`, you do not have to say `--hash --abbrev`; `--hash=len` would do. --q, --quiet:: +-q:: +--quiet:: Do not print any results to stdout. When combined with '--verify' this can be used to silently check if a reference exists. ---exclude-existing, --exclude-existing=pattern:: +--exclude-existing:: +--exclude-existing=pattern:: Make git-show-ref act as a filter that reads refs from stdin of the form "^(?:\s)?(?:\^\{\})?$" and performs the diff --git a/git-stripspace.html b/git-stripspace.html index 8fe0a07bd..fe10615b7 100644 --- a/git-stripspace.html +++ b/git-stripspace.html @@ -282,7 +282,10 @@ git-stripspace(1) Manual Page
--s|--strip-comments +-s +
+
+--strip-comments

@@ -313,7 +316,7 @@ git-stripspace(1) Manual Page

diff --git a/git-stripspace.txt b/git-stripspace.txt index 4883834a1..8421a39f2 100644 --- a/git-stripspace.txt +++ b/git-stripspace.txt @@ -16,7 +16,8 @@ Remove multiple empty lines, and empty lines at beginning and end. OPTIONS ------- --s|--strip-comments:: +-s:: +--strip-comments:: In addition to empty lines, also strip lines starting with '#'. :: diff --git a/git-submodule.html b/git-submodule.html index b5dee973e..5dcaf8534 100644 --- a/git-submodule.html +++ b/git-submodule.html @@ -353,7 +353,10 @@ summary
--q, --quiet +-q +
+
+--quiet

@@ -361,7 +364,10 @@ summary

--b, --branch +-b +
+
+--branch

@@ -379,7 +385,10 @@ summary

--n, --summary-limit +-n +
+
+--summary-limit

@@ -419,7 +428,7 @@ for details.

diff --git a/git-submodule.txt b/git-submodule.txt index 139206f01..441ae1483 100644 --- a/git-submodule.txt +++ b/git-submodule.txt @@ -61,10 +61,12 @@ summary:: OPTIONS ------- --q, --quiet:: +-q:: +--quiet:: Only print error messages. --b, --branch:: +-b:: +--branch:: Branch of repository to add as submodule. --cached:: @@ -72,7 +74,8 @@ OPTIONS commands typically use the commit found in the submodule HEAD, but with this option, the commit stored in the index is used instead. --n, --summary-limit:: +-n:: +--summary-limit:: This option is only valid for the summary command. Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited diff --git a/git-symbolic-ref.html b/git-symbolic-ref.html index 71dc61894..2fefbb66b 100644 --- a/git-symbolic-ref.html +++ b/git-symbolic-ref.html @@ -290,7 +290,10 @@ a regular file whose contents is ref: refs/heads/master.

--q, --quiet +-q +
+
+--quiet

@@ -336,7 +339,7 @@ name is not a symbolic ref, or 128 if another error occurs.

diff --git a/git-symbolic-ref.txt b/git-symbolic-ref.txt index e9b996baa..3d3a059c5 100644 --- a/git-symbolic-ref.txt +++ b/git-symbolic-ref.txt @@ -26,7 +26,8 @@ a regular file whose contents is `ref: refs/heads/master`. OPTIONS ------- --q, --quiet:: +-q:: +--quiet:: Do not issue an error message if the is not a symbolic ref but a detached HEAD; instead exit with non-zero status silently. diff --git a/git-update-index.html b/git-update-index.html index b9976533c..30c972e5a 100644 --- a/git-update-index.html +++ b/git-update-index.html @@ -386,7 +386,10 @@ using the various options:

---assume-unchanged, --no-assume-unchanged +--assume-unchanged +
+
+--no-assume-unchanged

@@ -403,7 +406,10 @@ using the various options:

---again, -g +-g +
+
+--again

@@ -727,7 +733,7 @@ from symbolic link to regular file.

diff --git a/git-update-index.txt b/git-update-index.txt index c70336518..bbb0a6ad5 100644 --- a/git-update-index.txt +++ b/git-update-index.txt @@ -76,7 +76,8 @@ OPTIONS --chmod=(+|-)x:: Set the execute permissions on the updated files. ---assume-unchanged, --no-assume-unchanged:: +--assume-unchanged:: +--no-assume-unchanged:: When these flags are specified, the object name recorded for the paths are not updated. Instead, these options sets and unsets the "assume unchanged" bit for the @@ -88,7 +89,8 @@ OPTIONS filesystem that has very slow lstat(2) system call (e.g. cifs). ---again, -g:: +-g:: +--again:: Runs `git-update-index` itself on the paths whose index entries are different from those from the `HEAD` commit. diff --git a/git-update-server-info.html b/git-update-server-info.html index 35ae187d7..4568ee9f6 100644 --- a/git-update-server-info.html +++ b/git-update-server-info.html @@ -286,7 +286,10 @@ generates such auxiliary files.

--f|--force +-f +
+
+--force

@@ -332,7 +335,7 @@ info/refs file unless --force flag is given.

diff --git a/git-update-server-info.txt b/git-update-server-info.txt index aa1ee67cb..d21be41d0 100644 --- a/git-update-server-info.txt +++ b/git-update-server-info.txt @@ -22,7 +22,8 @@ generates such auxiliary files. OPTIONS ------- --f|--force:: +-f:: +--force:: Update the info files from scratch. diff --git a/git-upload-pack.html b/git-upload-pack.html index 28f3ff0ae..5293f3127 100644 --- a/git-upload-pack.html +++ b/git-upload-pack.html @@ -326,7 +326,7 @@ repository. For push operations, see git-send-pack.

diff --git a/git-upload-pack.txt b/git-upload-pack.txt index 521da5b20..bac465e13 100644 --- a/git-upload-pack.txt +++ b/git-upload-pack.txt @@ -24,10 +24,10 @@ repository. For push operations, see 'git-send-pack'. OPTIONS ------- -\--strict:: +--strict:: Do not try /.git/ if is no git directory. -\--timeout=:: +--timeout=:: Interrupt transfer after seconds of inactivity. :: diff --git a/git-web--browse.html b/git-web--browse.html index 6c16b2d41..b7a27f15d 100644 --- a/git-web--browse.html +++ b/git-web--browse.html @@ -328,7 +328,10 @@ open (this is the default under Mac OS X GUI)
--b BROWSER|--browser=BROWSER +-b BROWSER +
+
+--browser=BROWSER

@@ -337,7 +340,10 @@ open (this is the default under Mac OS X GUI)

--t BROWSER|--tool=BROWSER +-t BROWSER +
+
+--tool=BROWSER

@@ -345,7 +351,10 @@ open (this is the default under Mac OS X GUI)

--c CONF.VAR|--config=CONF.VAR +-c CONF.VAR +
+
+--config=CONF.VAR

@@ -419,7 +428,7 @@ git-list <git@vger.kernel.org>.

diff --git a/git-web--browse.txt b/git-web--browse.txt index f8d5fb11d..e80a7c1cc 100644 --- a/git-web--browse.txt +++ b/git-web--browse.txt @@ -31,14 +31,17 @@ Custom commands may also be specified. OPTIONS ------- --b BROWSER|--browser=BROWSER:: +-b BROWSER:: +--browser=BROWSER:: Use the specified BROWSER. It must be in the list of supported browsers. --t BROWSER|--tool=BROWSER:: +-t BROWSER:: +--tool=BROWSER:: Same as above. --c CONF.VAR|--config=CONF.VAR:: +-c CONF.VAR:: +--config=CONF.VAR:: CONF.VAR is looked up in the git config files. If it's set, then its value specify the browser that should be used. diff --git a/git.html b/git.html index b795b2579..2f51ea550 100644 --- a/git.html +++ b/git.html @@ -333,7 +333,10 @@ help ….

--p|--paginate +-p +
+
+--paginate

@@ -1960,7 +1963,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index cf67110a9..ee9677400 100644 --- a/git.txt +++ b/git.txt @@ -138,7 +138,8 @@ help ...'. environment variable. If no path is given 'git' will print the current setting and then exit. --p|--paginate:: +-p:: +--paginate:: Pipe all output into 'less' (or if set, $PAGER). --no-pager:: diff --git a/gitk.html b/gitk.html index 96b2d3e3b..9cf30ae59 100644 --- a/gitk.html +++ b/gitk.html @@ -290,7 +290,10 @@ the git-rev-list(1) command. This manual page de frequently used options.

--n <number>, --max-count=<number> +-n <number> +
+
+--max-count=<number>

@@ -440,7 +443,7 @@ such as display options, font, and colors.

diff --git a/gitk.txt b/gitk.txt index 14bcf91f4..f843f39bf 100644 --- a/gitk.txt +++ b/gitk.txt @@ -25,7 +25,8 @@ To control which revisions to shown, the command takes options applicable to the linkgit:git-rev-list[1] command. This manual page describes only the most frequently used options. --n , --max-count=:: +-n :: +--max-count=:: Limits the number of commits to show. diff --git a/merge-options.txt b/merge-options.txt index f37a77648..ffbc6e986 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -2,10 +2,12 @@ Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat. --n, \--no-stat:: +-n:: +--no-stat:: Do not show diffstat at the end of the merge. ---summary, \--no-summary:: +--summary:: +--no-summary:: Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future. @@ -49,7 +51,8 @@ a fast-forward, only update the branch pointer. This is the default behavior of git-merge. --s , \--strategy=:: +-s :: +--strategy=:: Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies diff --git a/rev-list-options.txt b/rev-list-options.txt index 05d5abec2..37dd1d61e 100644 --- a/rev-list-options.txt +++ b/rev-list-options.txt @@ -129,7 +129,8 @@ limiting may be applied. -- --n 'number', --max-count='number':: +-n 'number':: +--max-count='number':: Limit the number of commits output. @@ -137,21 +138,25 @@ limiting may be applied. Skip 'number' commits before starting to show the commit output. ---since='date', --after='date':: +--since='date':: +--after='date':: Show commits more recent than a specific date. ---until='date', --before='date':: +--until='date':: +--before='date':: Show commits older than a specific date. ifdef::git-rev-list[] ---max-age='timestamp', --min-age='timestamp':: +--max-age='timestamp':: +--min-age='timestamp':: Limit the commits output to specified time range. endif::git-rev-list[] ---author='pattern', --committer='pattern':: +--author='pattern':: +--committer='pattern':: Limit the commits output to ones with author/committer header lines that match the specified pattern (regular expression). @@ -161,16 +166,19 @@ endif::git-rev-list[] Limit the commits output to ones with log message that matches the specified pattern (regular expression). --i, --regexp-ignore-case:: +-i:: +--regexp-ignore-case:: Match the regexp limiting patterns without regard to letters case. --E, --extended-regexp:: +-E:: +--extended-regexp:: Consider the limiting patterns to be extended regular expressions instead of the default basic regular expressions. --F, --fixed-strings:: +-F:: +--fixed-strings:: Consider the limiting patterns to be fixed strings (don't interpret pattern as a regular expression). @@ -239,7 +247,8 @@ from the other branch (for example, "3rd on b" may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output. --g, --walk-reflogs:: +-g:: +--walk-reflogs:: Instead of walking the commit ancestry chain, walk reflog entries from the most recent one to older ones. @@ -268,7 +277,8 @@ See also linkgit:git-reflog[1]. Output uninteresting commits at the boundary, which are usually not shown. ---dense, --sparse:: +--dense:: +--sparse:: When optional paths are given, the default behaviour ('--dense') is to only output commits that changes at least one of them, and also ignore