diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-23 16:07:42 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-23 16:07:42 +0900 |
| commit | b9d9d90d180cf21baeeb16bd89828d25c7901470 (patch) | |
| tree | a40241052af8d4f5543b66581e3f0235cfae0af3 /git-pull.html | |
| parent | ccb8252b46bfba5daf0cfcedaf0f9d2e14ba356f (diff) | |
| download | git-htmldocs-b9d9d90d180cf21baeeb16bd89828d25c7901470.tar.gz | |
Autogenerated HTML docs for v2.17.0-775-ge144d
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/git-pull.html b/git-pull.html index 9b71a0535..da2a30ed1 100644 --- a/git-pull.html +++ b/git-pull.html @@ -1,9 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.9" />
+<meta name="generator" content="AsciiDoc 8.6.10" />
<title>git-pull(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -1070,7 +1071,7 @@ option can be used to override --squash.</p></div> -r
</dt>
<dt class="hdlist1">
---rebase[=false|true|preserve|interactive]
+--rebase[=false|true|merges|preserve|interactive]
</dt>
<dd>
<p>
@@ -1080,6 +1081,9 @@ option can be used to override --squash.</p></div> was rebased since last fetched, the rebase uses that information
to avoid rebasing non-local changes.
</p>
+<div class="paragraph"><p>When set to <code>merges</code>, rebase using <code>git rebase --rebase-merges</code> so that
+the local merge commits are included in the rebase (see
+<a href="git-rebase.html">git-rebase(1)</a> for details).</p></div>
<div class="paragraph"><p>When set to preserve, rebase with the <code>--preserve-merges</code> option passed
to <code>git rebase</code> so that locally created merge commits will not be flattened.</p></div>
<div class="paragraph"><p>When false, merge the current branch into the upstream branch.</p></div>
@@ -1289,6 +1293,21 @@ the current repository has the same history as the source repository.</p></div> </p>
</dd>
<dt class="hdlist1">
+-o <option>
+</dt>
+<dt class="hdlist1">
+--server-option=<option>
+</dt>
+<dd>
+<p>
+ Transmit the given string to the server when communicating using
+ protocol version 2. The given string must not contain a NUL or LF
+ character.
+ When multiple <code>--server-option=<option></code> are given, they are all
+ sent to the other side in the order listed on the command line.
+</p>
+</dd>
+<dt class="hdlist1">
-4
</dt>
<dt class="hdlist1">
@@ -2018,7 +2037,7 @@ version.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2018-01-26 15:11:04 PST
+ 2018-05-23 16:06:29 JST
</div>
</div>
</body>
|