[\-n] [\-l | \-\-files\-with\-matches] [\-L | \-\-files\-without\-match]
[\-c | \-\-count]
[\-A <post\-context>] [\-B <pre\-context>] [\-C <context>]
- [\-f <file>] [\-e <pattern>]
+ [\-f <file>] [\-e] <pattern>
[<tree>...]
[\-\-] [<path>...]
.fi
\-f <file>
Read patterns from <file>, 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
<tree>...
Search blobs in the trees for specified patterns\&.
.SH "SYNOPSIS"
-git\-merge [\-n] [\-\-no\-commit] [\-s <strategy>]... <msg> <head> <remote> <remote>...
+\fIgit\-merge\fR [\-n] [\-\-no\-commit] [\-s <strategy>]... <msg> <head> <remote> <remote>...
.SH "DESCRIPTION"
\-\-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>, \-\-strategy=<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)\&.
\-\-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>, \-\-strategy=<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)\&.
.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
projects / git.git / commitdiff