From: Junio C Hamano Date: Mon, 26 Jun 2006 23:47:06 +0000 (+0000) Subject: Autogenerated man pages for v1.4.1-rc1-g1ef9 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f3d391b472798bb2bc248d1696c9e7103b8a52ab;p=git.git Autogenerated man pages for v1.4.1-rc1-g1ef9 --- diff --git a/man1/git-grep.1 b/man1/git-grep.1 index 496f6322d..00ccd1896 100755 --- a/man1/git-grep.1 +++ b/man1/git-grep.1 @@ -30,7 +30,7 @@ git-grep \- Print lines matching a pattern [\-n] [\-l | \-\-files\-with\-matches] [\-L | \-\-files\-without\-match] [\-c | \-\-count] [\-A ] [\-B ] [\-C ] - [\-f ] [\-e ] + [\-f ] [\-e] [...] [\-\-] [...] .fi @@ -86,6 +86,10 @@ Show context trailing (A -- after), or leading (B -- before), or both (C -- cont \-f Read patterns from , one per line\&. +.TP +\-e +The next parameter is the pattern\&. This option has to be used for patterns starting with \- and should be used in scripts passing user input to grep\&. + .TP ... Search blobs in the trees for specified patterns\&. diff --git a/man1/git-merge.1 b/man1/git-merge.1 index 1e1515139..5d5fd82aa 100755 --- a/man1/git-merge.1 +++ b/man1/git-merge.1 @@ -23,7 +23,7 @@ git-merge \- Grand Unified Merge Driver .SH "SYNOPSIS" -git\-merge [\-n] [\-\-no\-commit] [\-s ]... ... +\fIgit\-merge\fR [\-n] [\-\-no\-commit] [\-s ]... ... .SH "DESCRIPTION" @@ -40,6 +40,10 @@ Do not show diffstat at the end of the merge\&. \-\-no\-commit Perform the merge but pretend the merge failed and do not autocommit, to give the user a chance to inspect and further tweak the merge result before committing\&. +.TP +\-\-squash +Produce the working tree and index state as if a real merge happened, but do not actually make a commit or move the HEAD, nor record $GIT_DIR/MERGE_HEAD to cause the next git commit command to create a merge commit\&. This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)\&. + .TP \-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)\&. diff --git a/man1/git-pull.1 b/man1/git-pull.1 index 22f61baeb..73e961b3b 100755 --- a/man1/git-pull.1 +++ b/man1/git-pull.1 @@ -43,6 +43,10 @@ Do not show diffstat at the end of the merge\&. \-\-no\-commit Perform the merge but pretend the merge failed and do not autocommit, to give the user a chance to inspect and further tweak the merge result before committing\&. +.TP +\-\-squash +Produce the working tree and index state as if a real merge happened, but do not actually make a commit or move the HEAD, nor record $GIT_DIR/MERGE_HEAD to cause the next git commit command to create a merge commit\&. This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)\&. + .TP \-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)\&. diff --git a/man1/git-rebase.1 b/man1/git-rebase.1 index a2b2b166a..c4de7856d 100755 --- a/man1/git-rebase.1 +++ b/man1/git-rebase.1 @@ -127,7 +127,7 @@ Restore the original branch and abort the rebase operation\&. .TP \-\-skip -Restart the rebasing process by skipping the current patch\&. This does not work with the \-\-merge option\&. +Restart the rebasing process by skipping the current patch\&. .TP \-\-merge