[-n] [-l | --files-with-matches] [-L | --files-without-match]\r
[-c | --count]\r
[-A <post-context>] [-B <pre-context>] [-C <context>]\r
- [-f <file>] [-e <pattern>]\r
+ [-f <file>] [-e] <pattern>\r
[<tree>…]\r
[--] [<path>…]</div></div>\r
</div>\r
</p>\r
</dd>\r
<dt>\r
+-e\r
+</dt>\r
+<dd>\r
+<p>\r
+ The next parameter is the pattern. This option has to be\r
+ used for patterns starting with - and should be used in\r
+ scripts passing user input to grep.\r
+</p>\r
+</dd>\r
+<dt>\r
<tt><tree>…</tt>\r
</dt>\r
<dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Jun-2006 07:24:27 UTC\r
+Last updated 26-Jun-2006 23:46:44 UTC\r
</div>\r
</div>\r
</body>\r
[-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>...]
-f <file>::
Read patterns from <file>, one per line.
+-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.
+
`<tree>...`::
Search blobs in the trees for specified patterns.
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.1" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
</p>\r
</dd>\r
<dt>\r
+--squash\r
+</dt>\r
+<dd>\r
+<p>\r
+ Produce the working tree and index state as if a real\r
+ merge happened, but do not actually make a commit or\r
+ move the <tt>HEAD</tt>, nor record <tt>$GIT_DIR/MERGE_HEAD</tt> to\r
+ cause the next <tt>git commit</tt> command to create a merge\r
+ commit. This allows you to create a single commit on\r
+ top of the current branch whose effect is the same as\r
+ merging another branch (or more in case of an octopus).\r
+</p>\r
+</dd>\r
+<dt>\r
-s <strategy>, --strategy=<strategy>\r
</dt>\r
<dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:16:22 PDT\r
+Last updated 26-Jun-2006 23:46:45 UTC\r
</div>\r
</div>\r
</body>\r
</p>\r
</dd>\r
<dt>\r
+--squash\r
+</dt>\r
+<dd>\r
+<p>\r
+ Produce the working tree and index state as if a real\r
+ merge happened, but do not actually make a commit or\r
+ move the <tt>HEAD</tt>, nor record <tt>$GIT_DIR/MERGE_HEAD</tt> to\r
+ cause the next <tt>git commit</tt> command to create a merge\r
+ commit. This allows you to create a single commit on\r
+ top of the current branch whose effect is the same as\r
+ merging another branch (or more in case of an octopus).\r
+</p>\r
+</dd>\r
+<dt>\r
-s <strategy>, --strategy=<strategy>\r
</dt>\r
<dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 10-Mar-2006 00:31:31 UTC\r
+Last updated 26-Jun-2006 23:46:45 UTC\r
</div>\r
</div>\r
</body>\r
<dd>\r
<p>\r
Restart the rebasing process by skipping the current patch.\r
- This does not work with the --merge option.\r
</p>\r
</dd>\r
<dt>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 22-Jun-2006 19:49:25 UTC\r
+Last updated 26-Jun-2006 23:46:46 UTC\r
</div>\r
</div>\r
</body>\r
--skip::
Restart the rebasing process by skipping the current patch.
- This does not work with the --merge option.
--merge::
Use merging strategies to rebase. When the recursive (default) merge
not autocommit, to give the user a chance to inspect and
further tweak the merge result before committing.
+--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).
-s <strategy>, \--strategy=<strategy>::
Use the given merge strategy; can be supplied more than
My Various Git Projects / git.git / commitdiff