From c720187e454696c492deebcc5c94089c636b8dec Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 10 Mar 2006 00:33:15 +0000 Subject: [PATCH] Autogenerated man pages for v1.2.4-gf61c2 --- man1/git-add.1 | 2 +- man1/git-applypatch.1 | 6 ++--- man1/git-branch.1 | 12 ++++++--- man1/git-check-ref-format.1 | 8 +++--- man1/git-checkout.1 | 48 +++++++++++++++++++++++------------- man1/git-cherry-pick.1 | 6 ++--- man1/git-cherry.1 | 6 ++--- man1/git-clone-pack.1 | 10 ++++---- man1/git-clone.1 | 34 +++++++++++++++---------- man1/git-count-objects.1 | 4 +-- man1/git-daemon.1 | 2 +- man1/git-describe.1 | 4 +-- man1/git-diff-stages.1 | 14 ++++++++--- man1/git-diff.1 | 22 +++++++++++------ man1/git-fetch-pack.1 | 2 +- man1/git-fetch.1 | 2 +- man1/git-format-patch.1 | 2 +- man1/git-get-tar-commit-id.1 | 4 +-- man1/git-grep.1 | 4 +-- man1/git-hash-object.1 | 4 +-- man1/git-http-push.1 | 12 ++++----- man1/git-lost-found.1 | 20 +++++++++------ man1/git-ls-remote.1 | 4 +-- man1/git-ls-tree.1 | 10 ++++---- man1/git-mailinfo.1 | 6 ++--- man1/git-mailsplit.1 | 4 +-- man1/git-mv.1 | 6 ++--- man1/git-name-rev.1 | 12 ++++++--- man1/git-pack-objects.1 | 2 +- man1/git-pack-redundant.1 | 2 +- man1/git-patch-id.1 | 4 +-- man1/git-peek-remote.1 | 8 +++--- man1/git-pull.1 | 14 +++++++---- man1/git-push.1 | 2 +- man1/git-rebase.1 | 2 +- man1/git-relink.1 | 4 +-- man1/git-repo-config.1 | 42 ++++++++++++++++++++++--------- man1/git-request-pull.1 | 4 +-- man1/git-reset.1 | 28 +++++++++++++++------ man1/git-rev-parse.1 | 2 +- man1/git-revert.1 | 4 +-- man1/git-rm.1 | 2 +- man1/git-send-pack.1 | 22 ++++++++--------- man1/git-sh-setup.1 | 8 +++--- man1/git-shortlog.1 | 2 +- man1/git-show-branch.1 | 10 +++++--- man1/git-show.1 | 2 +- man1/git-status.1 | 8 +++--- man1/git-stripspace.1 | 4 +-- man1/git-unpack-objects.1 | 4 +-- man1/git-upload-pack.1 | 8 +++--- man1/git-verify-pack.1 | 4 +-- man1/git-verify-tag.1 | 4 +-- man1/git-whatchanged.1 | 12 ++++----- man7/git.7 | 22 +++++++++++------ 55 files changed, 300 insertions(+), 200 deletions(-) diff --git a/man1/git-add.1 b/man1/git-add.1 index ae2f6eade..731b9092f 100755 --- a/man1/git-add.1 +++ b/man1/git-add.1 @@ -19,7 +19,7 @@ .. .TH "GIT-ADD" 1 "" "" "" .SH NAME -git-add \- Add files to the index file. +git-add \- Add files to the index file .SH "SYNOPSIS" diff --git a/man1/git-applypatch.1 b/man1/git-applypatch.1 index 899501036..6cfd8d3c5 100755 --- a/man1/git-applypatch.1 +++ b/man1/git-applypatch.1 @@ -19,16 +19,16 @@ .. .TH "GIT-APPLYPATCH" 1 "" "" "" .SH NAME -git-applypatch \- Apply one patch extracted from an e-mail. +git-applypatch \- Apply one patch extracted from an e-mail .SH "SYNOPSIS" -git\-applypatch [] +\fIgit\-applypatch\fR [] .SH "DESCRIPTION" -Takes three files , , and prepared from an e\-mail message by git\-mailinfo, and creates a commit\&. It is usually not necessary to use this command directly\&. +Takes three files , , and prepared from an e\-mail message by \fIgit\-mailinfo\fR, and creates a commit\&. It is usually not necessary to use this command directly\&. This command can run applypatch\-msg, pre\-applypatch, and post\-applypatch hooks\&. See hooks: \fIhooks.html\fR for more information\&. diff --git a/man1/git-branch.1 b/man1/git-branch.1 index dfe3a760d..a5c574fd1 100755 --- a/man1/git-branch.1 +++ b/man1/git-branch.1 @@ -19,11 +19,11 @@ .. .TH "GIT-BRANCH" 1 "" "" "" .SH NAME -git-branch \- Create a new branch, or remove an old one. +git-branch \- Create a new branch, or remove an old one .SH "SYNOPSIS" -git\-branch [(\-d | \-D) ] | [[\-f] []] +\fIgit\-branch\fR [(\-d | \-D) ] | [[\-f] []] .SH "DESCRIPTION" @@ -60,23 +60,27 @@ Where to create the branch; defaults to HEAD\&. This option has no meaning with .TP Start development off of a know tag -.IP +.nf $ git clone git://git\&.kernel\&.org/pub/scm/\&.\&.\&./linux\-2\&.6 my2\&.6 $ cd my2\&.6 $ git branch my2\&.6\&.14 v2\&.6\&.14 $ git checkout my2\&.6\&.14 These two steps are the same as "checkout \-b my2\&.6\&.14 v2\&.6\&.14"\&. +.fi + .TP Delete unneeded branch -.IP +.nf $ git clone git://git\&.kernel\&.org/\&.\&.\&./git\&.git my\&.git $ cd my\&.git $ git branch \-D todo delete todo branch even if the "master" branch does not have all commits from todo branch\&. +.fi + .SH "AUTHOR" diff --git a/man1/git-check-ref-format.1 b/man1/git-check-ref-format.1 index 3b7ee7784..831eda224 100755 --- a/man1/git-check-ref-format.1 +++ b/man1/git-check-ref-format.1 @@ -19,16 +19,16 @@ .. .TH "GIT-CHECK-REF-FORM" 1 "" "" "" .SH NAME -git-check-ref-format \- Make sure ref name is well formed. +git-check-ref-format \- Make sure ref name is well formed .SH "SYNOPSIS" -git\-check\-ref\-format +\fIgit\-check\-ref\-format\fR .SH "DESCRIPTION" -Checks if a given refname is acceptable, and exits non\-zero if it is not\&. +Checks if a given \fIrefname\fR is acceptable, and exits non\-zero if it is not\&. A reference is used in git to specify branches and tags\&. A branch head is stored under $GIT_DIR/refs/heads directory, and a tag is stored under $GIT_DIR/refs/tags directory\&. git imposes the following rules on how refs are named: @@ -55,7 +55,7 @@ These rules makes it easy for shell script based tools to parse refnames, pathna double\-dot \&.\&. are often used as in ref1\&.\&.ref2, and in some context this notation means ^ref1 ref2 (i\&.e\&. not in ref1 and in ref2)\&. .TP 2. -tilde ~ and caret ^ are used to introduce postfix nth parent and peel onion operation\&. +tilde ~ and caret ^ are used to introduce postfix \fInth parent\fR and \fIpeel onion\fR operation\&. .TP 3. colon : is used as in srcref:dstref to mean "use srcref's value and store it in dstref" in fetch and push operations\&. diff --git a/man1/git-checkout.1 b/man1/git-checkout.1 index a3529cfd9..c62369493 100755 --- a/man1/git-checkout.1 +++ b/man1/git-checkout.1 @@ -19,11 +19,11 @@ .. .TH "GIT-CHECKOUT" 1 "" "" "" .SH NAME -git-checkout \- Checkout and switch to a branch. +git-checkout \- Checkout and switch to a branch .SH "SYNOPSIS" -git\-checkout [\-f] [\-b ] [\-m] [] [...] +\fIgit\-checkout\fR [\-f] [\-b ] [\-m] [] [...] .SH "DESCRIPTION" @@ -31,7 +31,7 @@ git\-checkout [\-f] [\-b ] [\-m] [] [...] When are not given, this command switches branches, by updating the index and working tree to reflect the specified branch, , and updating HEAD to be or, if specified, \&. -When are given, this command does not switch branches\&. It updates the named paths in the working tree from the index file (i\&.e\&. it runs git\-checkout\-index \-f \-u)\&. In this case, \-f and \-b options are meaningless and giving either of them results in an error\&. argument can be used to specify a specific tree\-ish to update the index for the given paths before updating the working tree\&. +When are given, this command does \fInot\fR switch branches\&. It updates the named paths in the working tree from the index file (i\&.e\&. it runs git\-checkout\-index \-f \-u)\&. In this case, \-f and \-b options are meaningless and giving either of them results in an error\&. argument can be used to specify a specific tree\-ish to update the index for the given paths before updating the working tree\&. .SH "OPTIONS" @@ -64,7 +64,7 @@ Branch to checkout; may be any object ID that resolves to a commit\&. Defaults t The following sequence checks out the master branch, reverts the Makefile to two revisions back, deletes hello\&.c by mistake, and gets it back from the index\&. -.IP +.nf $ git checkout master $ git checkout master~2 Makefile $ rm \-f hello\&.c @@ -72,41 +72,55 @@ $ git checkout hello\&.c switch branch take out a file out of other commit - or "git checkout \-\- hello\&.c", as in the next example\&.If you have an unfortunate branch that is named hello\&.c, the last step above would be confused as an instruction to switch to that branch\&. You should instead write: + or "git checkout \-\- hello\&.c", as in the next example\&. +.fi +If you have an unfortunate branch that is named hello\&.c, the last step above would be confused as an instruction to switch to that branch\&. You should instead write: -.IP -$ git checkout \-\- hello\&.c.TP +.nf +$ git checkout \-\- hello\&.c +.fi +.TP 2. After working in a wrong branch, switching to the correct branch you would want to is done with: -.IP -$ git checkout mytopicHowever, your "wrong" branch and correct "mytopic" branch may differ in files that you have locally modified, in which case, the above checkout would fail like this: +.nf +$ git checkout mytopic +.fi +However, your "wrong" branch and correct "mytopic" branch may differ in files that you have locally modified, in which case, the above checkout would fail like this: -.IP +.nf $ git checkout mytopic -fatal: Entry 'frotz' not uptodate\&. Cannot merge\&.You can give the \-m flag to the command, which would try a three\-way merge: +fatal: Entry 'frotz' not uptodate\&. Cannot merge\&. +.fi +You can give the \-m flag to the command, which would try a three\-way merge: -.IP +.nf $ git checkout \-m mytopic -Auto\-merging frotzAfter this three\-way merge, the local modifications are _not_ registered in your index file, so git diff would show you what changes you made since the tip of the new branch\&. +Auto\-merging frotz +.fi +After this three\-way merge, the local modifications are _not_ registered in your index file, so git diff would show you what changes you made since the tip of the new branch\&. .TP 3. When a merge conflict happens during switching branches with the \-m option, you would see something like this: -.IP +.nf $ git checkout \-m mytopic Auto\-merging frotz merge: warning: conflicts during merge ERROR: Merge conflict in frotz -fatal: merge program failedAt this point, git diff shows the changes cleanly merged as in the previous example, as well as the changes in the conflicted files\&. Edit and resolve the conflict and mark it resolved with git update\-index as usual: +fatal: merge program failed +.fi +At this point, git diff shows the changes cleanly merged as in the previous example, as well as the changes in the conflicted files\&. Edit and resolve the conflict and mark it resolved with git update\-index as usual: -.IP +.nf $ edit frotz -$ git update\-index frotz.LP +$ git update\-index frotz +.fi +.LP .SH "AUTHOR" diff --git a/man1/git-cherry-pick.1 b/man1/git-cherry-pick.1 index 11b20ba1b..32748344d 100755 --- a/man1/git-cherry-pick.1 +++ b/man1/git-cherry-pick.1 @@ -19,11 +19,11 @@ .. .TH "GIT-CHERRY-PICK" 1 "" "" "" .SH NAME -git-cherry-pick \- Apply the change introduced by an existing commit. +git-cherry-pick \- Apply the change introduced by an existing commit .SH "SYNOPSIS" -git\-cherry\-pick [\-\-edit] [\-n] [\-r] +\fIgit\-cherry\-pick\fR [\-\-edit] [\-n] [\-r] .SH "DESCRIPTION" @@ -42,7 +42,7 @@ With this option, git\-cherry\-pick will let you edit the commit message prior c .TP \-r|\-\-replay -Usually the command appends which commit was cherry\-picked after the original commit message when making a commit\&. This option, \-\-replay, causes it to use the original commit message intact\&. This is useful when you are reordering the patches in your private tree before publishing\&. +Usually the command appends which commit was cherry\-picked after the original commit message when making a commit\&. This option, \fI\-\-replay\fR, causes it to use the original commit message intact\&. This is useful when you are reordering the patches in your private tree before publishing\&. .TP \-n|\-\-no\-commit diff --git a/man1/git-cherry.1 b/man1/git-cherry.1 index aa706f424..e8b8d509c 100755 --- a/man1/git-cherry.1 +++ b/man1/git-cherry.1 @@ -19,16 +19,16 @@ .. .TH "GIT-CHERRY" 1 "" "" "" .SH NAME -git-cherry \- Find commits not merged upstream. +git-cherry \- Find commits not merged upstream .SH "SYNOPSIS" -git\-cherry [\-v] [] +\fIgit\-cherry\fR [\-v] [] .SH "DESCRIPTION" -Each commit between the fork\-point and is examined, and compared against the change each commit between the fork\-point and introduces\&. Commits already included in upstream are prefixed with \- (meaning "drop from my local pull"), while commits missing from upstream are prefixed with + (meaning "add to the updated upstream")\&. +Each commit between the fork\-point and is examined, and compared against the change each commit between the fork\-point and introduces\&. Commits already included in upstream are prefixed with \fI\-\fR (meaning "drop from my local pull"), while commits missing from upstream are prefixed with \fI+\fR (meaning "add to the updated upstream")\&. .SH "OPTIONS" diff --git a/man1/git-clone-pack.1 b/man1/git-clone-pack.1 index b284fb0bb..845d0216d 100755 --- a/man1/git-clone-pack.1 +++ b/man1/git-clone-pack.1 @@ -19,26 +19,26 @@ .. .TH "GIT-CLONE-PACK" 1 "" "" "" .SH NAME -git-clone-pack \- Clones a repository by receiving packed objects. +git-clone-pack \- Clones a repository by receiving packed objects .SH "SYNOPSIS" -git\-clone\-pack [\-\-exec=] [:] [...] +\fIgit\-clone\-pack\fR [\-\-exec=] [:] [...] .SH "DESCRIPTION" -Clones a repository into the current repository by invoking git\-upload\-pack, possibly on the remote host via ssh, in the named repository, and stores the sent pack in the local repository\&. +Clones a repository into the current repository by invoking \fIgit\-upload\-pack\fR, possibly on the remote host via ssh, in the named repository, and stores the sent pack in the local repository\&. .SH "OPTIONS" .TP \-\-exec= -Use this to specify the path to git\-upload\-pack on the remote side, if it is not found on your $PATH\&. Installations of sshd ignore the user's environment setup scripts for login shells (e\&.g\&. \&.bash_profile) and your privately installed git may not be found on the system default $PATH\&. Another workaround suggested is to set up your $PATH in "\&.bashrc", but this flag is for people who do not want to pay the overhead for non\-interactive shells by having a lean \&.bashrc file (they set most of the things up in \&.bash_profile)\&. +Use this to specify the path to \fIgit\-upload\-pack\fR on the remote side, if it is not found on your $PATH\&. Installations of sshd ignore the user's environment setup scripts for login shells (e\&.g\&. \&.bash_profile) and your privately installed git may not be found on the system default $PATH\&. Another workaround suggested is to set up your $PATH in "\&.bashrc", but this flag is for people who do not want to pay the overhead for non\-interactive shells by having a lean \&.bashrc file (they set most of the things up in \&.bash_profile)\&. .TP -A remote host that houses the repository\&. When this part is specified, git\-upload\-pack is invoked via ssh\&. +A remote host that houses the repository\&. When this part is specified, \fIgit\-upload\-pack\fR is invoked via ssh\&. .TP diff --git a/man1/git-clone.1 b/man1/git-clone.1 index 3c58e9abc..fb56e48e6 100755 --- a/man1/git-clone.1 +++ b/man1/git-clone.1 @@ -19,11 +19,11 @@ .. .TH "GIT-CLONE" 1 "" "" "" .SH NAME -git-clone \- Clones a repository. +git-clone \- Clones a repository .SH "SYNOPSIS" .nf -git\-clone [\-l [\-s]] [\-q] [\-n] [\-\-bare] [\-o ] [\-u ] +\fIgit\-clone\fR [\-l [\-s]] [\-q] [\-n] [\-\-bare] [\-o ] [\-u ] [] .fi @@ -45,15 +45,15 @@ This is to help the typical workflow of working off of the remote master branch\ .SH "OPTIONS" .TP -\-\-local, \-l, +\-\-local, \-l When the repository to clone from is on a local machine, this flag bypasses normal "git aware" transport mechanism and clones the repository by making a copy of HEAD and everything under objects and refs directories\&. The files under \&.git/objects/ directory are hardlinked to save space when possible\&. .TP -\-\-shared, \-s, +\-\-shared, \-s When the repository to clone is on the local machine, instead of using hard links, automatically setup \&.git/objects/info/alternatives to share the objects with the source repository\&. The resulting repository starts out without any object of its own\&. .TP -\-\-quiet, \-q, +\-\-quiet, \-q Operate quietly\&. This flag is passed to "rsync" and "git\-clone\-pack" commands when given\&. .TP @@ -62,15 +62,15 @@ No checkout of HEAD is performed after the clone is complete\&. .TP \-\-bare -Make a bare GIT repository\&. That is, instead of creating and placing the administrative files in /\&.git, make the itself the $GIT_DIR\&. This implies \-n option\&. When this option is used, neither the origin branch nor the default remotes/origin file is created\&. +Make a \fIbare\fR GIT repository\&. That is, instead of creating and placing the administrative files in /\&.git, make the itself the $GIT_DIR\&. This implies \-n option\&. When this option is used, neither the origin branch nor the default remotes/origin file is created\&. .TP \-o -Instead of using the branch name origin to keep track of the upstream repository, use instead\&. Note that the shorthand name stored in remotes/origin is not affected, but the local branch name to pull the remote master branch into is\&. +Instead of using the branch name \fIorigin\fR to keep track of the upstream repository, use instead\&. Note that the shorthand name stored in remotes/origin is not affected, but the local branch name to pull the remote master branch into is\&. .TP -\-\-upload\-pack , \-u , -When given, and the repository to clone from is handled by git\-clone\-pack, \-\-exec= is passed to the command to specify non\-default path for the command run on the other end\&. +\-\-upload\-pack , \-u +When given, and the repository to clone from is handled by \fIgit\-clone\-pack\fR, \fI\-\-exec=\fR is passed to the command to specify non\-default path for the command run on the other end\&. .TP @@ -85,28 +85,36 @@ The name of a new directory to clone into\&. The "humanish" part of the source r .TP Clone from upstream -.IP +.nf $ git clone git://git\&.kernel\&.org/pub/scm/\&.\&.\&./linux\-2\&.6 my2\&.6 $ cd my2\&.6 $ make +.fi + .TP Make a local clone that borrows from the current directory, without checking things out -.IP +.nf $ git clone \-l \-s \-n \&. \&.\&./copy $ cd copy $ git show\-branch +.fi + .TP Create a bare repository to publish your changes to the public -.IP +.nf $ git clone \-\-bare \-l /home/proj/\&.git /pub/scm/proj\&.git +.fi + .TP Create a repository on the kernel\&.org machine that borrows from Linus -.IP +.nf $ git clone \-\-bare \-l \-s /pub/scm/\&.\&.\&./torvalds/linux\-2\&.6\&.git \\ /pub/scm/\&.\&.\&./me/subsys\-2\&.6\&.git +.fi + .SH "AUTHOR" diff --git a/man1/git-count-objects.1 b/man1/git-count-objects.1 index dfc0da446..f03032c32 100755 --- a/man1/git-count-objects.1 +++ b/man1/git-count-objects.1 @@ -19,11 +19,11 @@ .. .TH "GIT-COUNT-OBJECTS" 1 "" "" "" .SH NAME -git-count-objects \- Reports on unpacked objects. +git-count-objects \- Reports on unpacked objects .SH "SYNOPSIS" -git\-count\-objects +\fIgit\-count\-objects\fR .SH "DESCRIPTION" diff --git a/man1/git-daemon.1 b/man1/git-daemon.1 index 633356113..e1a31af56 100755 --- a/man1/git-daemon.1 +++ b/man1/git-daemon.1 @@ -19,7 +19,7 @@ .. .TH "GIT-DAEMON" 1 "" "" "" .SH NAME -git-daemon \- A really simple server for git repositories. +git-daemon \- A really simple server for git repositories .SH "SYNOPSIS" .nf diff --git a/man1/git-describe.1 b/man1/git-describe.1 index 92227772d..36c797bf0 100755 --- a/man1/git-describe.1 +++ b/man1/git-describe.1 @@ -19,11 +19,11 @@ .. .TH "GIT-DESCRIBE" 1 "" "" "" .SH NAME -git-describe \- Show the most recent tag that is reachable from a commit. +git-describe \- Show the most recent tag that is reachable from a commit .SH "SYNOPSIS" -git\-describe [\-\-all] [\-\-tags] [\-\-abbrev=] ... +\fIgit\-describe\fR [\-\-all] [\-\-tags] [\-\-abbrev=] ... .SH "DESCRIPTION" diff --git a/man1/git-diff-stages.1 b/man1/git-diff-stages.1 index 5c2501540..059fc0f5c 100755 --- a/man1/git-diff-stages.1 +++ b/man1/git-diff-stages.1 @@ -19,7 +19,7 @@ .. .TH "GIT-DIFF-STAGES" 1 "" "" "" .SH NAME -git-diff-stages \- Compares content and mode of blobs between stages in an unmerged index file. +git-diff-stages \- Compares content and mode of blobs between stages in an unmerged index file .SH "SYNOPSIS" @@ -134,13 +134,15 @@ compares the index and the files on the filesystem\&. An output line is formatted this way: -.IP +.nf in\-place edit :100644 100644 bcd1234\&.\&.\&. 0123456\&.\&.\&. M file0 copy\-edit :100644 100644 abcd123\&.\&.\&. 1234567\&.\&.\&. C68 file1 file2 rename\-edit :100644 100644 abcd123\&.\&.\&. 1234567\&.\&.\&. R86 file1 file3 create :000000 100644 0000000\&.\&.\&. 1234567\&.\&.\&. A file4 delete :100644 000000 1234567\&.\&.\&. 0000000\&.\&.\&. D file5 unmerged :000000 000000 0000000\&.\&.\&. 0000000\&.\&.\&. U file6 +.fi + That is, from the left to the right: @@ -197,8 +199,10 @@ an LF or a NUL when \fI\-z\fR option is used, to terminate the record\&. Example: -.IP +.nf :100644 100644 5be4a4\&.\&.\&.\&.\&.\&. 000000\&.\&.\&.\&.\&.\&. M file\&.c +.fi + When \-z option is not used, TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and \\\\, respectively\&. @@ -298,7 +302,7 @@ TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and git\-diff\-tree and git\-diff\-files can take \fI\-c\fR or \fI\-\-cc\fR option to produce \fIcombined diff\fR, which looks like this: -.IP +.nf diff \-\-combined describe\&.c @@@ +98,7 @@@ return (a_date > b_date) ? \-1 : (a_date == b_date) ? 0 : 1; @@ -310,6 +314,8 @@ diff \-\-combined describe\&.c { + unsigned char sha1[20]; + struct commit *cmit; +.fi + Unlike the traditional \fIunified\fR diff format, which shows two files A and B with a single column that has \- (minus -- appears in A but removed in B), + (plus -- missing in A but added to B), or (space -- unchanged) prefix, this format compares two or more files file1, file2,... with one file X, and shows how X differs from each of fileN\&. One column for each of fileN is prepended to the output line to note how X's line is different from it\&. diff --git a/man1/git-diff.1 b/man1/git-diff.1 index 2b907c069..063e11472 100755 --- a/man1/git-diff.1 +++ b/man1/git-diff.1 @@ -19,11 +19,11 @@ .. .TH "GIT-DIFF" 1 "" "" "" .SH NAME -git-diff \- Show changes between commits, commit and working tree, etc. +git-diff \- Show changes between commits, commit and working tree, etc .SH "SYNOPSIS" -git\-diff [ \-\-diff\-options ] {0,2} [...] +\fIgit\-diff\fR [ \-\-diff\-options ] {0,2} [...] .SH "DESCRIPTION" @@ -45,7 +45,7 @@ When two s are given, these two trees are compared using git\-diff\-tree\&. .TP \-\-diff\-options - \-\-diff\-options are passed to the git\-diff\-files, git\-diff\-index, and git\-diff\-tree commands\&. See the documentation for these commands for description\&. + \fI\-\-diff\-options\fR are passed to the git\-diff\-files, git\-diff\-index, and git\-diff\-tree commands\&. See the documentation for these commands for description\&. .TP ... @@ -56,7 +56,7 @@ The arguments are also passed to git\-diff\-* commands\&. .TP Various ways to check your working tree -.IP +.nf $ git diff $ git diff \-\-cached $ git diff HEAD @@ -66,10 +66,12 @@ $ git diff HEAD would be committing if you run "git commit" without "\-a" option\&. changes in the working tree since your last commit; what you would be committing if you run "git commit \-a" +.fi + .TP Comparing with arbitrary commits -.IP +.nf $ git diff test $ git diff HEAD \-\- \&./test $ git diff HEAD^ HEAD @@ -80,10 +82,12 @@ tip of "test" branch\&. the tip of the current branch, but limit the comparison to the file "test"\&. compare the version before the last commit and the last commit\&. +.fi + .TP Limiting the diff output -.IP +.nf $ git diff \-\-diff\-filter=MRC $ git diff \-\-name\-status \-r $ git diff arch/i386 include/asm\-i386 @@ -96,16 +100,20 @@ which in turn also disables recursive behaviour, so without \-r you would only see the directory name if there is a change in a file in a subdirectory\&. limit diff output to named subtrees\&. +.fi + .TP Munging the diff output -.IP +.nf $ git diff \-\-find\-copies\-harder \-B \-C $ git diff \-R spend extra cycles to find renames, copies and complete rewrites (very expensive)\&. output diff in reverse\&. +.fi + .SH "AUTHOR" diff --git a/man1/git-fetch-pack.1 b/man1/git-fetch-pack.1 index 34bbc3769..c8da52666 100755 --- a/man1/git-fetch-pack.1 +++ b/man1/git-fetch-pack.1 @@ -19,7 +19,7 @@ .. .TH "GIT-FETCH-PACK" 1 "" "" "" .SH NAME -git-fetch-pack \- Receive missing objects from another repository. +git-fetch-pack \- Receive missing objects from another repository .SH "SYNOPSIS" diff --git a/man1/git-fetch.1 b/man1/git-fetch.1 index d2a14688c..9e25988e8 100755 --- a/man1/git-fetch.1 +++ b/man1/git-fetch.1 @@ -19,7 +19,7 @@ .. .TH "GIT-FETCH" 1 "" "" "" .SH NAME -git-fetch \- Download objects and a head from another repository. +git-fetch \- Download objects and a head from another repository .SH "SYNOPSIS" diff --git a/man1/git-format-patch.1 b/man1/git-format-patch.1 index b93bd108d..5b0821934 100755 --- a/man1/git-format-patch.1 +++ b/man1/git-format-patch.1 @@ -19,7 +19,7 @@ .. .TH "GIT-FORMAT-PATCH" 1 "" "" "" .SH NAME -git-format-patch \- Prepare patches for e-mail submission. +git-format-patch \- Prepare patches for e-mail submission .SH "SYNOPSIS" .nf diff --git a/man1/git-get-tar-commit-id.1 b/man1/git-get-tar-commit-id.1 index 696dda789..e848ea1b9 100755 --- a/man1/git-get-tar-commit-id.1 +++ b/man1/git-get-tar-commit-id.1 @@ -19,11 +19,11 @@ .. .TH "GIT-GET-TAR-COMMIT" 1 "" "" "" .SH NAME -git-get-tar-commit-id \- Extract commit ID from an archive created using git-tar-tree. +git-get-tar-commit-id \- Extract commit ID from an archive created using git-tar-tree .SH "SYNOPSIS" -git\-get\-tar\-commit\-id < +\fIgit\-get\-tar\-commit\-id\fR < .SH "DESCRIPTION" diff --git a/man1/git-grep.1 b/man1/git-grep.1 index 17784fd80..676e25d16 100755 --- a/man1/git-grep.1 +++ b/man1/git-grep.1 @@ -19,11 +19,11 @@ .. .TH "GIT-GREP" 1 "" "" "" .SH NAME -git-grep \- print lines matching a pattern +git-grep \- Print lines matching a pattern .SH "SYNOPSIS" -git\-grep [