1674 lines
75 KiB
HTML
1674 lines
75 KiB
HTML
|
<!DOCTYPE html>
|
||
|
|
<html lang="en">
|
||
|
|
<head>
|
||
|
|
<meta charset="UTF-8">
|
||
|
|
<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge"><![endif]-->
|
||
|
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||
|
|
<meta name="generator" content="Asciidoctor 1.5.8">
|
||
|
|
<title>git-pull(1)</title>
|
||
|
|
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
|
||
|
|
<style>
|
||
|
|
/* Asciidoctor default stylesheet | MIT License | http://asciidoctor.org */
|
||
|
|
/* Uncomment @import statement below to use as custom stylesheet */
|
||
|
|
/*@import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700";*/
|
||
|
|
article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}
|
||
|
|
audio,canvas,video{display:inline-block}
|
||
|
|
audio:not([controls]){display:none;height:0}
|
||
|
|
script{display:none!important}
|
||
|
|
html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}
|
||
|
|
a{background:transparent}
|
||
|
|
a:focus{outline:thin dotted}
|
||
|
|
a:active,a:hover{outline:0}
|
||
|
|
h1{font-size:2em;margin:.67em 0}
|
||
|
|
abbr[title]{border-bottom:1px dotted}
|
||
|
|
b,strong{font-weight:bold}
|
||
|
|
dfn{font-style:italic}
|
||
|
|
hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}
|
||
|
|
mark{background:#ff0;color:#000}
|
||
|
|
code,kbd,pre,samp{font-family:monospace;font-size:1em}
|
||
|
|
pre{white-space:pre-wrap}
|
||
|
|
q{quotes:"\201C" "\201D" "\2018" "\2019"}
|
||
|
|
small{font-size:80%}
|
||
|
|
sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}
|
||
|
|
sup{top:-.5em}
|
||
|
|
sub{bottom:-.25em}
|
||
|
|
img{border:0}
|
||
|
|
svg:not(:root){overflow:hidden}
|
||
|
|
figure{margin:0}
|
||
|
|
fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}
|
||
|
|
legend{border:0;padding:0}
|
||
|
|
button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}
|
||
|
|
button,input{line-height:normal}
|
||
|
|
button,select{text-transform:none}
|
||
|
|
button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}
|
||
|
|
button[disabled],html input[disabled]{cursor:default}
|
||
|
|
input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}
|
||
|
|
button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}
|
||
|
|
textarea{overflow:auto;vertical-align:top}
|
||
|
|
table{border-collapse:collapse;border-spacing:0}
|
||
|
|
*,*::before,*::after{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
|
||
|
|
html,body{font-size:100%}
|
||
|
|
body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;font-weight:400;font-style:normal;line-height:1;position:relative;cursor:auto;tab-size:4;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}
|
||
|
|
a:hover{cursor:pointer}
|
||
|
|
img,object,embed{max-width:100%;height:auto}
|
||
|
|
object,embed{height:100%}
|
||
|
|
img{-ms-interpolation-mode:bicubic}
|
||
|
|
.left{float:left!important}
|
||
|
|
.right{float:right!important}
|
||
|
|
.text-left{text-align:left!important}
|
||
|
|
.text-right{text-align:right!important}
|
||
|
|
.text-center{text-align:center!important}
|
||
|
|
.text-justify{text-align:justify!important}
|
||
|
|
.hide{display:none}
|
||
|
|
img,object,svg{display:inline-block;vertical-align:middle}
|
||
|
|
textarea{height:auto;min-height:50px}
|
||
|
|
select{width:100%}
|
||
|
|
.center{margin-left:auto;margin-right:auto}
|
||
|
|
.stretch{width:100%}
|
||
|
|
.subheader,.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{line-height:1.45;color:#7a2518;font-weight:400;margin-top:0;margin-bottom:.25em}
|
||
|
|
div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0;direction:ltr}
|
||
|
|
a{color:#2156a5;text-decoration:underline;line-height:inherit}
|
||
|
|
a:hover,a:focus{color:#1d4b8f}
|
||
|
|
a img{border:none}
|
||
|
|
p{font-family:inherit;font-weight:400;font-size:1em;line-height:1.6;margin-bottom:1.25em;text-rendering:optimizeLegibility}
|
||
|
|
p aside{font-size:.875em;line-height:1.35;font-style:italic}
|
||
|
|
h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{font-family:"Open Sans","DejaVu Sans",sans-serif;font-weight:300;font-style:normal;color:#ba3925;text-rendering:optimizeLegibility;margin-top:1em;margin-bottom:.5em;line-height:1.0125em}
|
||
|
|
h1 small,h2 small,h3 small,#toctitle small,.sidebarblock>.content>.title small,h4 small,h5 small,h6 small{font-size:60%;color:#e99b8f;line-height:0}
|
||
|
|
h1{font-size:2.125em}
|
||
|
|
h2{font-size:1.6875em}
|
||
|
|
h3,#toctitle,.sidebarblock>.content>.title{font-size:1.375em}
|
||
|
|
h4,h5{font-size:1.125em}
|
||
|
|
h6{font-size:1em}
|
||
|
|
hr{border:solid #dddddf;border-width:1px 0 0;clear:both;margin:1.25em 0 1.1875em;height:0}
|
||
|
|
em,i{font-style:italic;line-height:inherit}
|
||
|
|
strong,b{font-weight:bold;line-height:inherit}
|
||
|
|
small{font-size:60%;line-height:inherit}
|
||
|
|
code{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;color:rgba(0,0,0,.9)}
|
||
|
|
ul,ol,dl{font-size:1em;line-height:1.6;margin-bottom:1.25em;list-style-position:outside;font-family:inherit}
|
||
|
|
ul,ol{margin-left:1.5em}
|
||
|
|
ul li ul,ul li ol{margin-left:1.25em;margin-bottom:0;font-size:1em}
|
||
|
|
ul.square li ul,ul.circle li ul,ul.disc li ul{list-style:inherit}
|
||
|
|
ul.square{list-style-type:square}
|
||
|
|
ul.circle{list-style-type:circle}
|
||
|
|
ul.disc{list-style-type:disc}
|
||
|
|
ol li ul,ol li ol{margin-left:1.25em;margin-bottom:0}
|
||
|
|
dl dt{margin-bottom:.3125em;font-weight:bold}
|
||
|
|
dl dd{margin-bottom:1.25em}
|
||
|
|
abbr,acronym{text-transform:uppercase;font-size:90%;color:rgba(0,0,0,.8);border-bottom:1px dotted #ddd;cursor:help}
|
||
|
|
abbr{text-transform:none}
|
||
|
|
blockquote{margin:0 0 1.25em;padding:.5625em 1.25em 0 1.1875em;border-left:1px solid #ddd}
|
||
|
|
blockquote cite{display:block;font-size:.9375em;color:rgba(0,0,0,.6)}
|
||
|
|
blockquote cite::before{content:"\2014 \0020"}
|
||
|
|
blockquote cite a,blockquote cite a:visited{color:rgba(0,0,0,.6)}
|
||
|
|
blockquote,blockquote p{line-height:1.6;color:rgba(0,0,0,.85)}
|
||
|
|
@media screen and (min-width:768px){h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2}
|
||
|
|
h1{font-size:2.75em}
|
||
|
|
h2{font-size:2.3125em}
|
||
|
|
h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em}
|
||
|
|
h4{font-size:1.4375em}}
|
||
|
|
table{background:#fff;margin-bottom:1.25em;border:solid 1px #dedede}
|
||
|
|
table thead,table tfoot{background:#f7f8f7}
|
||
|
|
table thead tr th,table thead tr td,table tfoot tr th,table tfoot tr td{padding:.5em .625em .625em;font-size:inherit;color:rgba(0,0,0,.8);text-align:left}
|
||
|
|
table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)}
|
||
|
|
table tr.even,table tr.alt,table tr:nth-of-type(even){background:#f8f8f7}
|
||
|
|
table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{display:table-cell;line-height:1.6}
|
||
|
|
h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em}
|
||
|
|
h1 strong,h2 strong,h3 strong,#toctitle strong,.sidebarblock>.content>.title strong,h4 strong,h5 strong,h6 strong{font-weight:400}
|
||
|
|
.clearfix::before,.clearfix::after,.float-group::before,.float-group::after{content:" ";display:table}
|
||
|
|
.clearfix::after,.float-group::after{clear:both}
|
||
|
|
*:not(pre)>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background-color:#f7f7f8;-webkit-border-radius:4px;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed;word-wrap:break-word}
|
||
|
|
*:not(pre)>code.nobreak{word-wrap:normal}
|
||
|
|
*:not(pre)>code.nowrap{white-space:nowrap}
|
||
|
|
pre,pre>code{line-height:1.45;color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;text-rendering:optimizeSpeed}
|
||
|
|
em em{font-style:normal}
|
||
|
|
strong strong{font-weight:400}
|
||
|
|
.keyseq{color:rgba(51,51,51,.8)}
|
||
|
|
kbd{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;display:inline-block;color:rgba(0,0,0,.8);font-size:.65em;line-height:1.45;background-color:#f7f7f7;border:1px solid #ccc;-webkit-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 .1em white inset;box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 .1em #fff inset;margin:0 .15em;padding:.2em .5em;vertical-align:middle;position:relative;top:-.1em;white-space:nowrap}
|
||
|
|
.keyseq kbd:first-child{margin-left:0}
|
||
|
|
.keyseq kbd:last-child{margin-right:0}
|
||
|
|
.menuseq,.menuref{color:#000}
|
||
|
|
.menuseq b:not(.caret),.menuref{font-weight:inherit}
|
||
|
|
.menuseq{word-spacing:-.02em}
|
||
|
|
.menuseq b.caret{font-size:1.25em;line-height:.8}
|
||
|
|
.menuseq i.caret{font-weight:bold;text-align:center;width:.45em}
|
||
|
|
b.button::before,b.button::after{position:relative;top:-1px;font-weight:400}
|
||
|
|
b.button::before{content:"[";padding:0 3px 0 2px}
|
||
|
|
b.button::after{content:"]";padding:0 2px 0 3px}
|
||
|
|
p a>code:hover{color:rgba(0,0,0,.9)}
|
||
|
|
#header,#content,#footnotes,#footer{width:100%;margin-left:auto;margin-right:auto;margin-top:0;margin-bottom:0;max-width:62.5em;*zoom:1;position:relative;padding-left:.9375em;padding-right:.9375em}
|
||
|
|
#header::before,#header::after,#content::before,#content::after,#footnotes::before,#footnotes::after,#footer::before,#footer::after{content:" ";display:table}
|
||
|
|
#header::after,#content::after,#footnotes::after,#footer::after{clear:both}
|
||
|
|
#content{margin-top:1.25em}
|
||
|
|
#content::before{content:none}
|
||
|
|
#header>h1:first-child{color:rgba(0,0,0,.85);margin-top:2.25rem;margin-bottom:0}
|
||
|
|
#header>h1:first-child+#toc{margin-top:8px;border-top:1px solid #dddddf}
|
||
|
|
#header>h1:only-child,body.toc2 #header>h1:nth-last-child(2){border-bottom:1px solid #dddddf;padding-bottom:8px}
|
||
|
|
#header .details{border-bottom:1px solid #dddddf;line-height:1.45;padding-top:.25em;padding-bottom:.25em;padding-left:.25em;color:rgba(0,0,0,.6);display:-ms-flexbox;display:-webkit-flex;display:flex;-ms-flex-flow:row wrap;-webkit-flex-flow:row wrap;flex-flow:row wrap}
|
||
|
|
#header .details span:first-child{margin-left:-.125em}
|
||
|
|
#header .details span.email a{color:rgba(0,0,0,.85)}
|
||
|
|
#header .details br{display:none}
|
||
|
|
#header .details br+span::before{content:"\00a0\2013\00a0"}
|
||
|
|
#header .details br+span.author::before{content:"\00a0\22c5\00a0";color:rgba(0,0,0,.85)}
|
||
|
|
#header .details br+span#revremark::before{content:"\00a0|\00a0"}
|
||
|
|
#header #revnumber{text-transform:capitalize}
|
||
|
|
#header #revnumber::after{content:"\00a0"}
|
||
|
|
#content>h1:first-child:not([class]){color:rgba(0,0,0,.85);border-bottom:1px solid #dddddf;padding-bottom:8px;margin-top:0;padding-top:1rem;margin-bottom:1.25rem}
|
||
|
|
#toc{border-bottom:1px solid #e7e7e9;padding-bottom:.5em}
|
||
|
|
#toc>ul{margin-left:.125em}
|
||
|
|
#toc ul.sectlevel0>li>a{font-style:italic}
|
||
|
|
#toc ul.sectlevel0 ul.sectlevel1{margin:.5em 0}
|
||
|
|
#toc ul{font-family:"Open Sans","DejaVu Sans",sans-serif;list-style-type:none}
|
||
|
|
#toc li{line-height:1.3334;margin-top:.3334em}
|
||
|
|
#toc a{text-decoration:none}
|
||
|
|
#toc a:active{text-decoration:underline}
|
||
|
|
#toctitle{color:#7a2518;font-size:1.2em}
|
||
|
|
@media screen and (min-width:768px){#toctitle{font-size:1.375em}
|
||
|
|
body.toc2{padding-left:15em;padding-right:0}
|
||
|
|
#toc.toc2{margin-top:0!important;background-color:#f8f8f7;position:fixed;width:15em;left:0;top:0;border-right:1px solid #e7e7e9;border-top-width:0!important;border-bottom-width:0!important;z-index:1000;padding:1.25em 1em;height:100%;overflow:auto}
|
||
|
|
#toc.toc2 #toctitle{margin-top:0;margin-bottom:.8rem;font-size:1.2em}
|
||
|
|
#toc.toc2>ul{font-size:.9em;margin-bottom:0}
|
||
|
|
#toc.toc2 ul ul{margin-left:0;padding-left:1em}
|
||
|
|
#toc.toc2 ul.sectlevel0 ul.sectlevel1{padding-left:0;margin-top:.5em;margin-bottom:.5em}
|
||
|
|
body.toc2.toc-right{padding-left:0;padding-right:15em}
|
||
|
|
body.toc2.toc-right #toc.toc2{border-right-width:0;border-left:1px solid #e7e7e9;left:auto;right:0}}
|
||
|
|
@media screen and (min-width:1280px){body.toc2{padding-left:20em;padding-right:0}
|
||
|
|
#toc.toc2{width:20em}
|
||
|
|
#toc.toc2 #toctitle{font-size:1.375em}
|
||
|
|
#toc.toc2>ul{font-size:.95em}
|
||
|
|
#toc.toc2 ul ul{padding-left:1.25em}
|
||
|
|
body.toc2.toc-right{padding-left:0;padding-right:20em}}
|
||
|
|
#content #toc{border-style:solid;border-width:1px;border-color:#e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;-webkit-border-radius:4px;border-radius:4px}
|
||
|
|
#content #toc>:first-child{margin-top:0}
|
||
|
|
#content #toc>:last-child{margin-bottom:0}
|
||
|
|
#footer{max-width:100%;background-color:rgba(0,0,0,.8);padding:1.25em}
|
||
|
|
#footer-text{color:rgba(255,255,255,.8);line-height:1.44}
|
||
|
|
#content{margin-bottom:.625em}
|
||
|
|
.sect1{padding-bottom:.625em}
|
||
|
|
@media screen and (min-width:768px){#content{margin-bottom:1.25em}
|
||
|
|
.sect1{padding-bottom:1.25em}}
|
||
|
|
.sect1:last-child{padding-bottom:0}
|
||
|
|
.sect1+.sect1{border-top:1px solid #e7e7e9}
|
||
|
|
#content h1>a.anchor,h2>a.anchor,h3>a.anchor,#toctitle>a.anchor,.sidebarblock>.content>.title>a.anchor,h4>a.anchor,h5>a.anchor,h6>a.anchor{position:absolute;z-index:1001;width:1.5ex;margin-left:-1.5ex;display:block;text-decoration:none!important;visibility:hidden;text-align:center;font-weight:400}
|
||
|
|
#content h1>a.anchor::before,h2>a.anchor::before,h3>a.anchor::before,#toctitle>a.anchor::before,.sidebarblock>.content>.title>a.anchor::before,h4>a.anchor::before,h5>a.anchor::before,h6>a.anchor::before{content:"\00A7";font-size:.85em;display:block;padding-top:.1em}
|
||
|
|
#content h1:hover>a.anchor,#content h1>a.anchor:hover,h2:hover>a.anchor,h2>a.anchor:hover,h3:hover>a.anchor,#toctitle:hover>a.anchor,.sidebarblock>.content>.title:hover>a.anchor,h3>a.anchor:hover,#toctitle>a.anchor:hover,.sidebarblock>.content>.title>a.anchor:hover,h4:hover>a.anchor,h4>a.anchor:hover,h5:hover>a.anchor,h5>a.anchor:hover,h6:hover>a.anchor,h6>a.anchor:hover{visibility:visible}
|
||
|
|
#content h1>a.link,h2>a.link,h3>a.link,#toctitle>a.link,.sidebarblock>.content>.title>a.link,h4>a.link,h5>a.link,h6>a.link{color:#ba3925;text-decoration:none}
|
||
|
|
#content h1>a.link:hover,h2>a.link:hover,h3>a.link:hover,#toctitle>a.link:hover,.sidebarblock>.content>.title>a.link:hover,h4>a.link:hover,h5>a.link:hover,h6>a.link:hover{color:#a53221}
|
||
|
|
.audioblock,.imageblock,.literalblock,.listingblock,.stemblock,.videoblock{margin-bottom:1.25em}
|
||
|
|
.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{text-rendering:optimizeLegibility;text-align:left;font-family:"Noto Serif","DejaVu Serif",serif;font-size:1rem;font-style:italic}
|
||
|
|
table.tableblock.fit-content>caption.title{white-space:nowrap;width:0}
|
||
|
|
.paragraph.lead>p,#preamble>.sectionbody>[class="paragraph"]:first-of-type p{font-size:1.21875em;line-height:1.6;color:rgba(0,0,0,.85)}
|
||
|
|
table.tableblock #preamble>.sectionbody>[class="paragraph"]:first-of-type p{font-size:inherit}
|
||
|
|
.admonitionblock>table{border-collapse:separate;border:0;background:none;width:100%}
|
||
|
|
.admonitionblock>table td.icon{text-align:center;width:80px}
|
||
|
|
.admonitionblock>table td.icon img{max-width:none}
|
||
|
|
.admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase}
|
||
|
|
.admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #dddddf;color:rgba(0,0,0,.6)}
|
||
|
|
.admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0}
|
||
|
|
.exampleblock>.content{border-style:solid;border-width:1px;border-color:#e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;-webkit-border-radius:4px;border-radius:4px}
|
||
|
|
.exampleblock>.content>:first-child{margin-top:0}
|
||
|
|
.exampleblock>.content>:last-child{margin-bottom:0}
|
||
|
|
.sidebarblock{border-style:solid;border-width:1px;border-color:#e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;-webkit-border-radius:4px;border-radius:4px}
|
||
|
|
.sidebarblock>:first-child{margin-top:0}
|
||
|
|
.sidebarblock>:last-child{margin-bottom:0}
|
||
|
|
.sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center}
|
||
|
|
.exampleblock>.content>:last-child>:last-child,.exampleblock>.content .olist>ol>li:last-child>:last-child,.exampleblock>.content .ulist>ul>li:last-child>:last-child,.exampleblock>.content .qlist>ol>li:last-child>:last-child,.sidebarblock>.content>:last-child>:last-child,.sidebarblock>.content .olist>ol>li:last-child>:last-child,.sidebarblock>.content .ulist>ul>li:last-child>:last-child,.sidebarblock>.content .qlist>ol>li:last-child>:last-child{margin-bottom:0}
|
||
|
|
.literalblock pre,.listingblock pre:not(.highlight),.listingblock pre[class="highlight"],.listingblock pre[class^="highlight "],.listingblock pre.CodeRay,.listingblock pre.prettyprint{background:#f7f7f8}
|
||
|
|
.sidebarblock .literalblock pre,.sidebarblock .listingblock pre:not(.highlight),.sidebarblock .listingblock pre[class="highlight"],.sidebarblock .listingblock pre[class^="highlight "],.sidebarblock .listingblock pre.CodeRay,.sidebarblock .listingblock pre.prettyprint{background:#f2f1f1}
|
||
|
|
.literalblock pre,.literalblock pre[class],.listingblock pre,.listingblock pre[class]{-webkit-border-radius:4px;border-radius:4px;word-wrap:break-word;overflow-x:auto;padding:1em;font-size:.8125em}
|
||
|
|
@media screen and (min-width:768px){.literalblock pre,.literalblock pre[class],.listingblock pre,.listingblock pre[class]{font-size:.90625em}}
|
||
|
|
@media screen and (min-width:1280px){.literalblock pre,.literalblock pre[class],.listingblock pre,.listingblock pre[class]{font-size:1em}}
|
||
|
|
.literalblock pre.nowrap,.literalblock pre.nowrap pre,.listingblock pre.nowrap,.listingblock pre.nowrap pre{white-space:pre;word-wrap:normal}
|
||
|
|
.literalblock.output pre{color:#f7f7f8;background-color:rgba(0,0,0,.9)}
|
||
|
|
.listingblock pre.highlightjs{padding:0}
|
||
|
|
.listingblock pre.highlightjs>code{padding:1em;-webkit-border-radius:4px;border-radius:4px}
|
||
|
|
.listingblock pre.prettyprint{border-width:0}
|
||
|
|
.listingblock>.content{position:relative}
|
||
|
|
.listingblock code[data-lang]::before{display:none;content:attr(data-lang);position:absolute;font-size:.75em;top:.425rem;right:.5rem;line-height:1;text-transform:uppercase;color:#999}
|
||
|
|
.listingblock:hover code[data-lang]::before{display:block}
|
||
|
|
.listingblock.terminal pre .command::before{content:attr(data-prompt);padding-right:.5em;color:#999}
|
||
|
|
.listingblock.terminal pre .command:not([data-prompt])::before{content:"$"}
|
||
|
|
table.pyhltable{border-collapse:separate;border:0;margin-bottom:0;background:none}
|
||
|
|
table.pyhltable td{vertical-align:top;padding-top:0;padding-bottom:0;line-height:1.45}
|
||
|
|
table.pyhltable td.code{padding-left:.75em;padding-right:0}
|
||
|
|
pre.pygments .lineno,table.pyhltable td:not(.code){color:#999;padding-left:0;padding-right:.5em;border-right:1px solid #dddddf}
|
||
|
|
pre.pygments .lineno{display:inline-block;margin-right:.25em}
|
||
|
|
table.pyhltable .linenodiv{background:none!important;padding-right:0!important}
|
||
|
|
.quoteblock{margin:0 1em 1.25em 1.5em;display:table}
|
||
|
|
.quoteblock>.title{margin-left:-1.5em;margin-bottom:.75em}
|
||
|
|
.quoteblock blockquote,.quoteblock p{color:rgba(0,0,0,.85);font-size:1.15rem;line-height:1.75;word-spacing:.1em;letter-spacing:0;font-style:italic;text-align:justify}
|
||
|
|
.quoteblock blockquote{margin:0;padding:0;border:0}
|
||
|
|
.quoteblock blockquote::before{content:"\201c";float:left;font-size:2.75em;font-weight:bold;line-height:.6em;margin-left:-.6em;color:#7a2518;text-shadow:0 1px 2px rgba(0,0,0,.1)}
|
||
|
|
.quoteblock blockquote>.paragraph:last-child p{margin-bottom:0}
|
||
|
|
.quoteblock .attribution{margin-top:.75em;margin-right:.5ex;text-align:right}
|
||
|
|
.verseblock{margin:0 1em 1.25em}
|
||
|
|
.verseblock pre{font-family:"Open Sans","DejaVu Sans",sans;font-size:1.15rem;color:rgba(0,0,0,.85);font-weight:300;text-rendering:optimizeLegibility}
|
||
|
|
.verseblock pre strong{font-weight:400}
|
||
|
|
.verseblock .attribution{margin-top:1.25rem;margin-left:.5ex}
|
||
|
|
.quoteblock .attribution,.verseblock .attribution{font-size:.9375em;line-height:1.45;font-style:italic}
|
||
|
|
.quoteblock .attribution br,.verseblock .attribution br{display:none}
|
||
|
|
.quoteblock .attribution cite,.verseblock .attribution cite{display:block;letter-spacing:-.025em;color:rgba(0,0,0,.6)}
|
||
|
|
.quoteblock.abstract blockquote::before,.quoteblock.excerpt blockquote::before,.quoteblock .quoteblock blockquote::before{display:none}
|
||
|
|
.quoteblock.abstract blockquote,.quoteblock.abstract p,.quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{line-height:1.6;word-spacing:0}
|
||
|
|
.quoteblock.abstract{margin:0 1em 1.25em;display:block}
|
||
|
|
.quoteblock.abstract>.title{margin:0 0 .375em;font-size:1.15em;text-align:center}
|
||
|
|
.quoteblock.excerpt,.quoteblock .quoteblock{margin:0 0 1.25em;padding:0 0 .25em 1em;border-left:.25em solid #dddddf}
|
||
|
|
.quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{color:inherit;font-size:1.0625rem}
|
||
|
|
.quoteblock.excerpt .attribution,.quoteblock .quoteblock .attribution{color:inherit;text-align:left;margin-right:0}
|
||
|
|
table.tableblock{max-width:100%;border-collapse:separate}
|
||
|
|
p.tableblock:last-child{margin-bottom:0}
|
||
|
|
td.tableblock>.content{margin-bottom:-1.25em}
|
||
|
|
table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede}
|
||
|
|
table.grid-all>thead>tr>.tableblock,table.grid-all>tbody>tr>.tableblock{border-width:0 1px 1px 0}
|
||
|
|
table.grid-all>tfoot>tr>.tableblock{border-width:1px 1px 0 0}
|
||
|
|
table.grid-cols>*>tr>.tableblock{border-width:0 1px 0 0}
|
||
|
|
table.grid-rows>thead>tr>.tableblock,table.grid-rows>tbody>tr>.tableblock{border-width:0 0 1px}
|
||
|
|
table.grid-rows>tfoot>tr>.tableblock{border-width:1px 0 0}
|
||
|
|
table.grid-all>*>tr>.tableblock:last-child,table.grid-cols>*>tr>.tableblock:last-child{border-right-width:0}
|
||
|
|
table.grid-all>tbody>tr:last-child>.tableblock,table.grid-all>thead:last-child>tr>.tableblock,table.grid-rows>tbody>tr:last-child>.tableblock,table.grid-rows>thead:last-child>tr>.tableblock{border-bottom-width:0}
|
||
|
|
table.frame-all{border-width:1px}
|
||
|
|
table.frame-sides{border-width:0 1px}
|
||
|
|
table.frame-topbot,table.frame-ends{border-width:1px 0}
|
||
|
|
table.stripes-all tr,table.stripes-odd tr:nth-of-type(odd){background:#f8f8f7}
|
||
|
|
table.stripes-none tr,table.stripes-odd tr:nth-of-type(even){background:none}
|
||
|
|
th.halign-left,td.halign-left{text-align:left}
|
||
|
|
th.halign-right,td.halign-right{text-align:right}
|
||
|
|
th.halign-center,td.halign-center{text-align:center}
|
||
|
|
th.valign-top,td.valign-top{vertical-align:top}
|
||
|
|
th.valign-bottom,td.valign-bottom{vertical-align:bottom}
|
||
|
|
th.valign-middle,td.valign-middle{vertical-align:middle}
|
||
|
|
table thead th,table tfoot th{font-weight:bold}
|
||
|
|
tbody tr th{display:table-cell;line-height:1.6;background:#f7f8f7}
|
||
|
|
tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold}
|
||
|
|
p.tableblock>code:only-child{background:none;padding:0}
|
||
|
|
p.tableblock{font-size:1em}
|
||
|
|
td>div.verse{white-space:pre}
|
||
|
|
ol{margin-left:1.75em}
|
||
|
|
ul li ol{margin-left:1.5em}
|
||
|
|
dl dd{margin-left:1.125em}
|
||
|
|
dl dd:last-child,dl dd:last-child>:last-child{margin-bottom:0}
|
||
|
|
ol>li p,ul>li p,ul dd,ol dd,.olist .olist,.ulist .ulist,.ulist .olist,.olist .ulist{margin-bottom:.625em}
|
||
|
|
ul.checklist,ul.none,ol.none,ul.no-bullet,ol.no-bullet,ol.unnumbered,ul.unstyled,ol.unstyled{list-style-type:none}
|
||
|
|
ul.no-bullet,ol.no-bullet,ol.unnumbered{margin-left:.625em}
|
||
|
|
ul.unstyled,ol.unstyled{margin-left:0}
|
||
|
|
ul.checklist{margin-left:.625em}
|
||
|
|
ul.checklist li>p:first-child>.fa-square-o:first-child,ul.checklist li>p:first-child>.fa-check-square-o:first-child{width:1.25em;font-size:.8em;position:relative;bottom:.125em}
|
||
|
|
ul.checklist li>p:first-child>input[type="checkbox"]:first-child{margin-right:.25em}
|
||
|
|
ul.inline{display:-ms-flexbox;display:-webkit-box;display:flex;-ms-flex-flow:row wrap;-webkit-flex-flow:row wrap;flex-flow:row wrap;list-style:none;margin:0 0 .625em -1.25em}
|
||
|
|
ul.inline>li{margin-left:1.25em}
|
||
|
|
.unstyled dl dt{font-weight:400;font-style:normal}
|
||
|
|
ol.arabic{list-style-type:decimal}
|
||
|
|
ol.decimal{list-style-type:decimal-leading-zero}
|
||
|
|
ol.loweralpha{list-style-type:lower-alpha}
|
||
|
|
ol.upperalpha{list-style-type:upper-alpha}
|
||
|
|
ol.lowerroman{list-style-type:lower-roman}
|
||
|
|
ol.upperroman{list-style-type:upper-roman}
|
||
|
|
ol.lowergreek{list-style-type:lower-greek}
|
||
|
|
.hdlist>table,.colist>table{border:0;background:none}
|
||
|
|
.hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none}
|
||
|
|
td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em}
|
||
|
|
td.hdlist1{font-weight:bold;padding-bottom:1.25em}
|
||
|
|
.literalblock+.colist,.listingblock+.colist{margin-top:-.5em}
|
||
|
|
.colist td:not([class]):first-child{padding:.4em .75em 0;line-height:1;vertical-align:top}
|
||
|
|
.colist td:not([class]):first-child img{max-width:none}
|
||
|
|
.colist td:not([class]):last-child{padding:.25em 0}
|
||
|
|
.thumb,.th{line-height:0;display:inline-block;border:solid 4px #fff;-webkit-box-shadow:0 0 0 1px #ddd;box-shadow:0 0 0 1px #ddd}
|
||
|
|
.imageblock.left{margin:.25em .625em 1.25em 0}
|
||
|
|
.imageblock.right{margin:.25em 0 1.25em .625em}
|
||
|
|
.imageblock>.title{margin-bottom:0}
|
||
|
|
.imageblock.thumb,.imageblock.th{border-width:6px}
|
||
|
|
.imageblock.thumb>.title,.imageblock.th>.title{padding:0 .125em}
|
||
|
|
.image.left,.image.right{margin-top:.25em;margin-bottom:.25em;display:inline-block;line-height:0}
|
||
|
|
.image.left{margin-right:.625em}
|
||
|
|
.image.right{margin-left:.625em}
|
||
|
|
a.image{text-decoration:none;display:inline-block}
|
||
|
|
a.image object{pointer-events:none}
|
||
|
|
sup.footnote,sup.footnoteref{font-size:.875em;position:static;vertical-align:super}
|
||
|
|
sup.footnote a,sup.footnoteref a{text-decoration:none}
|
||
|
|
sup.footnote a:active,sup.footnoteref a:active{text-decoration:underline}
|
||
|
|
#footnotes{padding-top:.75em;padding-bottom:.75em;margin-bottom:.625em}
|
||
|
|
#footnotes hr{width:20%;min-width:6.25em;margin:-.25em 0 .75em;border-width:1px 0 0}
|
||
|
|
#footnotes .footnote{padding:0 .375em 0 .225em;line-height:1.3334;font-size:.875em;margin-left:1.2em;margin-bottom:.2em}
|
||
|
|
#footnotes .footnote a:first-of-type{font-weight:bold;text-decoration:none;margin-left:-1.05em}
|
||
|
|
#footnotes .footnote:last-of-type{margin-bottom:0}
|
||
|
|
#content #footnotes{margin-top:-.625em;margin-bottom:0;padding:.75em 0}
|
||
|
|
.gist .file-data>table{border:0;background:#fff;width:100%;margin-bottom:0}
|
||
|
|
.gist .file-data>table td.line-data{width:99%}
|
||
|
|
div.unbreakable{page-break-inside:avoid}
|
||
|
|
.big{font-size:larger}
|
||
|
|
.small{font-size:smaller}
|
||
|
|
.underline{text-decoration:underline}
|
||
|
|
.overline{text-decoration:overline}
|
||
|
|
.line-through{text-decoration:line-through}
|
||
|
|
.aqua{color:#00bfbf}
|
||
|
|
.aqua-background{background-color:#00fafa}
|
||
|
|
.black{color:#000}
|
||
|
|
.black-background{background-color:#000}
|
||
|
|
.blue{color:#0000bf}
|
||
|
|
.blue-background{background-color:#0000fa}
|
||
|
|
.fuchsia{color:#bf00bf}
|
||
|
|
.fuchsia-background{background-color:#fa00fa}
|
||
|
|
.gray{color:#606060}
|
||
|
|
.gray-background{background-color:#7d7d7d}
|
||
|
|
.green{color:#006000}
|
||
|
|
.green-background{background-color:#007d00}
|
||
|
|
.lime{color:#00bf00}
|
||
|
|
.lime-background{background-color:#00fa00}
|
||
|
|
.maroon{color:#600000}
|
||
|
|
.maroon-background{background-color:#7d0000}
|
||
|
|
.navy{color:#000060}
|
||
|
|
.navy-background{background-color:#00007d}
|
||
|
|
.olive{color:#606000}
|
||
|
|
.olive-background{background-color:#7d7d00}
|
||
|
|
.purple{color:#600060}
|
||
|
|
.purple-background{background-color:#7d007d}
|
||
|
|
.red{color:#bf0000}
|
||
|
|
.red-background{background-color:#fa0000}
|
||
|
|
.silver{color:#909090}
|
||
|
|
.silver-background{background-color:#bcbcbc}
|
||
|
|
.teal{color:#006060}
|
||
|
|
.teal-background{background-color:#007d7d}
|
||
|
|
.white{color:#bfbfbf}
|
||
|
|
.white-background{background-color:#fafafa}
|
||
|
|
.yellow{color:#bfbf00}
|
||
|
|
.yellow-background{background-color:#fafa00}
|
||
|
|
span.icon>.fa{cursor:default}
|
||
|
|
a span.icon>.fa{cursor:inherit}
|
||
|
|
.admonitionblock td.icon [class^="fa icon-"]{font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
|
||
|
|
.admonitionblock td.icon .icon-note::before{content:"\f05a";color:#19407c}
|
||
|
|
.admonitionblock td.icon .icon-tip::before{content:"\f0eb";text-shadow:1px 1px 2px rgba(155,155,0,.8);color:#111}
|
||
|
|
.admonitionblock td.icon .icon-warning::before{content:"\f071";color:#bf6900}
|
||
|
|
.admonitionblock td.icon .icon-caution::before{content:"\f06d";color:#bf3400}
|
||
|
|
.admonitionblock td.icon .icon-important::before{content:"\f06a";color:#bf0000}
|
||
|
|
.conum[data-value]{display:inline-block;color:#fff!important;background-color:rgba(0,0,0,.8);-webkit-border-radius:100px;border-radius:100px;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold}
|
||
|
|
.conum[data-value] *{color:#fff!important}
|
||
|
|
.conum[data-value]+b{display:none}
|
||
|
|
.conum[data-value]::after{content:attr(data-value)}
|
||
|
|
pre .conum[data-value]{position:relative;top:-.125em}
|
||
|
|
b.conum *{color:inherit!important}
|
||
|
|
.conum:not([data-value]):empty{display:none}
|
||
|
|
dt,th.tableblock,td.content,div.footnote{text-rendering:optimizeLegibility}
|
||
|
|
h1,h2,p,td.content,span.alt{letter-spacing:-.01em}
|
||
|
|
p strong,td.content strong,div.footnote strong{letter-spacing:-.005em}
|
||
|
|
p,blockquote,dt,td.content,span.alt{font-size:1.0625rem}
|
||
|
|
p{margin-bottom:1.25rem}
|
||
|
|
.sidebarblock p,.sidebarblock dt,.sidebarblock td.content,p.tableblock{font-size:1em}
|
||
|
|
.exampleblock>.content{background-color:#fffef7;border-color:#e0e0dc;-webkit-box-shadow:0 1px 4px #e0e0dc;box-shadow:0 1px 4px #e0e0dc}
|
||
|
|
.print-only{display:none!important}
|
||
|
|
@page{margin:1.25cm .75cm}
|
||
|
|
@media print{*{-webkit-box-shadow:none!important;box-shadow:none!important;text-shadow:none!important}
|
||
|
|
html{font-size:80%}
|
||
|
|
a{color:inherit!important;text-decoration:underline!important}
|
||
|
|
a.bare,a[href^="#"],a[href^="mailto:"]{text-decoration:none!important}
|
||
|
|
a[href^="http:"]:not(.bare)::after,a[href^="https:"]:not(.bare)::after{content:"(" attr(href) ")";display:inline-block;font-size:.875em;padding-left:.25em}
|
||
|
|
abbr[title]::after{content:" (" attr(title) ")"}
|
||
|
|
pre,blockquote,tr,img,object,svg{page-break-inside:avoid}
|
||
|
|
thead{display:table-header-group}
|
||
|
|
svg{max-width:100%}
|
||
|
|
p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3}
|
||
|
|
h2,h3,#toctitle,.sidebarblock>.content>.title{page-break-after:avoid}
|
||
|
|
#toc,.sidebarblock,.exampleblock>.content{background:none!important}
|
||
|
|
#toc{border-bottom:1px solid #dddddf!important;padding-bottom:0!important}
|
||
|
|
body.book #header{text-align:center}
|
||
|
|
body.book #header>h1:first-child{border:0!important;margin:2.5em 0 1em}
|
||
|
|
body.book #header .details{border:0!important;display:block;padding:0!important}
|
||
|
|
body.book #header .details span:first-child{margin-left:0!important}
|
||
|
|
body.book #header .details br{display:block}
|
||
|
|
body.book #header .details br+span::before{content:none!important}
|
||
|
|
body.book #toc{border:0!important;text-align:left!important;padding:0!important;margin:0!important}
|
||
|
|
body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-break-before:always}
|
||
|
|
.listingblock code[data-lang]::before{display:block}
|
||
|
|
#footer{padding:0 .9375em}
|
||
|
|
.hide-on-print{display:none!important}
|
||
|
|
.print-only{display:block!important}
|
||
|
|
.hide-for-print{display:none!important}
|
||
|
|
.show-for-print{display:inherit!important}}
|
||
|
|
@media print,amzn-kf8{#header>h1:first-child{margin-top:1.25rem}
|
||
|
|
.sect1{padding:0!important}
|
||
|
|
.sect1+.sect1{border:0}
|
||
|
|
#footer{background:none}
|
||
|
|
#footer-text{color:rgba(0,0,0,.6);font-size:.9em}}
|
||
|
|
@media amzn-kf8{#header,#content,#footnotes,#footer{padding:0}}
|
||
|
|
</style>
|
||
|
|
</head>
|
||
|
|
<body class="manpage">
|
||
|
|
<div id="header">
|
||
|
|
<h1>git-pull(1) Manual Page</h1>
|
||
|
|
<h2 id="_name">NAME</h2>
|
||
|
|
<div class="sectionbody">
|
||
|
|
<p>git-pull - Fetch from and integrate with another repository or a local branch</p>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div id="content">
|
||
|
|
<div class="sect1">
|
||
|
|
<h2 id="_synopsis">SYNOPSIS</h2>
|
||
|
|
<div class="sectionbody">
|
||
|
|
<div class="verseblock">
|
||
|
|
<pre class="content"><em>git pull</em> [<options>] [<repository> [<refspec>…​]]</pre>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sect1">
|
||
|
|
<h2 id="_description">DESCRIPTION</h2>
|
||
|
|
<div class="sectionbody">
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>Incorporates changes from a remote repository into the current
|
||
|
|
branch. In its default mode, <code>git pull</code> is shorthand for
|
||
|
|
<code>git fetch</code> followed by <code>git merge FETCH_HEAD</code>.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>More precisely, <em>git pull</em> runs <em>git fetch</em> with the given
|
||
|
|
parameters and calls <em>git merge</em> to merge the retrieved branch
|
||
|
|
heads into the current branch.
|
||
|
|
With <code>--rebase</code>, it runs <em>git rebase</em> instead of <em>git merge</em>.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p><repository> should be the name of a remote repository as
|
||
|
|
passed to <a href="git-fetch.html">git-fetch</a>(1). <refspec> can name an
|
||
|
|
arbitrary remote ref (for example, the name of a tag) or even
|
||
|
|
a collection of refs with corresponding remote-tracking branches
|
||
|
|
(e.g., refs/heads/*:refs/remotes/origin/*),
|
||
|
|
but usually it is the name of a branch in the remote repository.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>Default values for <repository> and <branch> are read from the
|
||
|
|
"remote" and "merge" configuration for the current branch
|
||
|
|
as set by <a href="git-branch.html">git-branch</a>(1) <code>--track</code>.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>Assume the following history exists and the current branch is
|
||
|
|
"<code>master</code>":</p>
|
||
|
|
</div>
|
||
|
|
<div class="listingblock">
|
||
|
|
<div class="content">
|
||
|
|
<pre> A---B---C master on origin
|
||
|
|
/
|
||
|
|
D---E---F---G master
|
||
|
|
^
|
||
|
|
origin/master in your repository</pre>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>Then "<code>git pull</code>" will fetch and replay the changes from the remote
|
||
|
|
<code>master</code> branch since it diverged from the local <code>master</code> (i.e., <code>E</code>)
|
||
|
|
until its current commit (<code>C</code>) on top of <code>master</code> and record the
|
||
|
|
result in a new commit along with the names of the two parent commits
|
||
|
|
and a log message from the user describing the changes.</p>
|
||
|
|
</div>
|
||
|
|
<div class="listingblock">
|
||
|
|
<div class="content">
|
||
|
|
<pre> A---B---C origin/master
|
||
|
|
/ \
|
||
|
|
D---E---F---G---H master</pre>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>See <a href="git-merge.html">git-merge</a>(1) for details, including how conflicts
|
||
|
|
are presented and handled.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>In Git 1.7.0 or later, to cancel a conflicting merge, use
|
||
|
|
<code>git reset --merge</code>. <strong>Warning</strong>: In older versions of Git, running <em>git pull</em>
|
||
|
|
with uncommitted changes is discouraged: while possible, it leaves you
|
||
|
|
in a state that may be hard to back out of in the case of a conflict.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>If any of the remote changes overlap with local uncommitted changes,
|
||
|
|
the merge will be automatically canceled and the work tree untouched.
|
||
|
|
It is generally best to get any local changes in working order before
|
||
|
|
pulling or stash them away with <a href="git-stash.html">git-stash</a>(1).</p>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sect1">
|
||
|
|
<h2 id="_options">OPTIONS</h2>
|
||
|
|
<div class="sectionbody">
|
||
|
|
<div class="dlist">
|
||
|
|
<dl>
|
||
|
|
<dt class="hdlist1">-q</dt>
|
||
|
|
<dt class="hdlist1">--quiet</dt>
|
||
|
|
<dd>
|
||
|
|
<p>This is passed to both underlying git-fetch to squelch reporting of
|
||
|
|
during transfer, and underlying git-merge to squelch output during
|
||
|
|
merging.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">-v</dt>
|
||
|
|
<dt class="hdlist1">--verbose</dt>
|
||
|
|
<dd>
|
||
|
|
<p>Pass --verbose to git-fetch and git-merge.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">--[no-]recurse-submodules[=yes|on-demand|no]</dt>
|
||
|
|
<dd>
|
||
|
|
<p>This option controls if new commits of all populated submodules should
|
||
|
|
be fetched and updated, too (see <a href="git-config.html">git-config</a>(1) and
|
||
|
|
<a href="gitmodules.html">gitmodules</a>(5)).</p>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>If the checkout is done via rebase, local submodule commits are rebased as well.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>If the update is done via merge, the submodule conflicts are resolved and checked out.</p>
|
||
|
|
</div>
|
||
|
|
</dd>
|
||
|
|
</dl>
|
||
|
|
</div>
|
||
|
|
<div class="sect2">
|
||
|
|
<h3 id="_options_related_to_merging">Options related to merging</h3>
|
||
|
|
<div class="dlist">
|
||
|
|
<dl>
|
||
|
|
<dt class="hdlist1">--commit</dt>
|
||
|
|
<dt class="hdlist1">--no-commit</dt>
|
||
|
|
<dd>
|
||
|
|
<p>Perform the merge and commit the result. This option can
|
||
|
|
be used to override --no-commit.</p>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>With --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.</p>
|
||
|
|
</div>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">--edit</dt>
|
||
|
|
<dt class="hdlist1">-e</dt>
|
||
|
|
<dt class="hdlist1">--no-edit</dt>
|
||
|
|
<dd>
|
||
|
|
<p>Invoke an editor before committing successful mechanical merge to
|
||
|
|
further edit the auto-generated merge message, so that the user
|
||
|
|
can explain and justify the merge. The <code>--no-edit</code> option can be
|
||
|
|
used to accept the auto-generated message (this is generally
|
||
|
|
discouraged).</p>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>Older scripts may depend on the historical behaviour of not allowing the
|
||
|
|
user to edit the merge log message. They will see an editor opened when
|
||
|
|
they run <code>git merge</code>. To make it easier to adjust such scripts to the
|
||
|
|
updated behaviour, the environment variable <code>GIT_MERGE_AUTOEDIT</code> can be
|
||
|
|
set to <code>no</code> at the beginning of them.</p>
|
||
|
|
</div>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">--ff</dt>
|
||
|
|
<dd>
|
||
|
|
<p>When the merge resolves as a fast-forward, only update the branch
|
||
|
|
pointer, without creating a merge commit. This is the default
|
||
|
|
behavior.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">--no-ff</dt>
|
||
|
|
<dd>
|
||
|
|
<p>Create a merge commit even when the merge resolves as a
|
||
|
|
fast-forward. This is the default behaviour when merging an
|
||
|
|
annotated (and possibly signed) tag that is not stored in
|
||
|
|
its natural place in <em>refs/tags/</em> hierarchy.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">--ff-only</dt>
|
||
|
|
<dd>
|
||
|
|
<p>Refuse to merge and exit with a non-zero status unless the
|
||
|
|
current <code>HEAD</code> is already up to date or the merge can be
|
||
|
|
resolved as a fast-forward.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">-S[<keyid>]</dt>
|
||
|
|
<dt class="hdlist1">--gpg-sign[=<keyid>]</dt>
|
||
|
|
<dd>
|
||
|
|
<p>GPG-sign the resulting merge commit. The <code>keyid</code> argument is
|
||
|
|
optional and defaults to the committer identity; if specified,
|
||
|
|
it must be stuck to the option without a space.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">--log[=<n>]</dt>
|
||
|
|
<dt class="hdlist1">--no-log</dt>
|
||
|
|
<dd>
|
||
|
|
<p>In addition to branch names, populate the log message with
|
||
|
|
one-line descriptions from at most <n> actual commits that are being
|
||
|
|
merged. See also <a href="git-fmt-merge-msg.html">git-fmt-merge-msg</a>(1).</p>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>With --no-log do not list one-line descriptions from the
|
||
|
|
actual commits being merged.</p>
|
||
|
|
</div>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">--signoff</dt>
|
||
|
|
<dt class="hdlist1">--no-signoff</dt>
|
||
|
|
<dd>
|
||
|
|
<p>Add Signed-off-by line by the committer at the end of the commit
|
||
|
|
log message. The meaning of a signoff depends on the project,
|
||
|
|
but it typically certifies that committer has
|
||
|
|
the rights to submit this work under the same license and
|
||
|
|
agrees to a Developer Certificate of Origin
|
||
|
|
(see <a href="http://developercertificate.org/" class="bare">http://developercertificate.org/</a> for more information).</p>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>With --no-signoff do not add a Signed-off-by line.</p>
|
||
|
|
</div>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">--stat</dt>
|
||
|
|
<dt class="hdlist1">-n</dt>
|
||
|
|
<dt class="hdlist1">--no-stat</dt>
|
||
|
|
<dd>
|
||
|
|
<p>Show a diffstat at the end of the merge. The diffstat is also
|
||
|
|
controlled by the configuration option merge.stat.</p>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>With -n or --no-stat do not show a diffstat at the end of the
|
||
|
|
merge.</p>
|
||
|
|
</div>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">--squash</dt>
|
||
|
|
<dt class="hdlist1">--no-squash</dt>
|
||
|
|
<dd>
|
||
|
|
<p>Produce the working tree and index state as if a real merge
|
||
|
|
happened (except for the merge information), but do not actually
|
||
|
|
make a commit, move the <code>HEAD</code>, or record <code>$GIT_DIR/MERGE_HEAD</code>
|
||
|
|
(to cause the next <code>git commit</code> 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).</p>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>With --no-squash perform the merge and commit the result. This
|
||
|
|
option can be used to override --squash.</p>
|
||
|
|
</div>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">-s <strategy></dt>
|
||
|
|
<dt class="hdlist1">--strategy=<strategy></dt>
|
||
|
|
<dd>
|
||
|
|
<p>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 <code>-s</code> option, a built-in list of strategies
|
||
|
|
is used instead (<em>git merge-recursive</em> when merging a single
|
||
|
|
head, <em>git merge-octopus</em> otherwise).</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">-X <option></dt>
|
||
|
|
<dt class="hdlist1">--strategy-option=<option></dt>
|
||
|
|
<dd>
|
||
|
|
<p>Pass merge strategy specific option through to the merge
|
||
|
|
strategy.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">--verify-signatures</dt>
|
||
|
|
<dt class="hdlist1">--no-verify-signatures</dt>
|
||
|
|
<dd>
|
||
|
|
<p>Verify that the tip commit of the side branch being merged is
|
||
|
|
signed with a valid key, i.e. a key that has a valid uid: in the
|
||
|
|
default trust model, this means the signing key has been signed by
|
||
|
|
a trusted key. If the tip commit of the side branch is not signed
|
||
|
|
with a valid key, the merge is aborted.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">--summary</dt>
|
||
|
|
<dt class="hdlist1">--no-summary</dt>
|
||
|
|
<dd>
|
||
|
|
<p>Synonyms to --stat and --no-stat; these are deprecated and will be
|
||
|
|
removed in the future.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">--allow-unrelated-histories</dt>
|
||
|
|
<dd>
|
||
|
|
<p>By default, <code>git merge</code> command refuses to merge histories
|
||
|
|
that do not share a common ancestor. This option can be
|
||
|
|
used to override this safety when merging histories of two
|
||
|
|
projects that started their lives independently. As that is
|
||
|
|
a very rare occasion, no configuration variable to enable
|
||
|
|
this by default exists and will not be added.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">-r</dt>
|
||
|
|
<dt class="hdlist1">--rebase[=false|true|merges|preserve|interactive]</dt>
|
||
|
|
<dd>
|
||
|
|
<p>When true, rebase the current branch on top of the upstream
|
||
|
|
branch after fetching. If there is a remote-tracking branch
|
||
|
|
corresponding to the upstream branch and the upstream branch
|
||
|
|
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</a>(1) 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>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>When <code>interactive</code>, enable the interactive mode of rebase.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>See <code>pull.rebase</code>, <code>branch.<name>.rebase</code> and <code>branch.autoSetupRebase</code> in
|
||
|
|
<a href="git-config.html">git-config</a>(1) if you want to make <code>git pull</code> always use
|
||
|
|
<code>--rebase</code> instead of merging.</p>
|
||
|
|
</div>
|
||
|
|
<div class="admonitionblock note">
|
||
|
|
<table>
|
||
|
|
<tr>
|
||
|
|
<td class="icon">
|
||
|
|
<div class="title">Note</div>
|
||
|
|
</td>
|
||
|
|
<td class="content">
|
||
|
|
This is a potentially <em>dangerous</em> mode of operation.
|
||
|
|
It rewrites history, which does not bode well when you
|
||
|
|
published that history already. Do <strong>not</strong> use this option
|
||
|
|
unless you have read <a href="git-rebase.html">git-rebase</a>(1) carefully.
|
||
|
|
</td>
|
||
|
|
</tr>
|
||
|
|
</table>
|
||
|
|
</div>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">--no-rebase</dt>
|
||
|
|
<dd>
|
||
|
|
<p>Override earlier --rebase.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">--autostash</dt>
|
||
|
|
<dt class="hdlist1">--no-autostash</dt>
|
||
|
|
<dd>
|
||
|
|
<p>Before starting rebase, stash local modifications away (see
|
||
|
|
<a href="git-stash.html">git-stash</a>(1)) if needed, and apply the stash entry when
|
||
|
|
done. <code>--no-autostash</code> is useful to override the <code>rebase.autoStash</code>
|
||
|
|
configuration variable (see <a href="git-config.html">git-config</a>(1)).</p>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>This option is only valid when "--rebase" is used.</p>
|
||
|
|
</div>
|
||
|
|
</dd>
|
||
|
|
</dl>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sect2">
|
||
|
|
<h3 id="_options_related_to_fetching">Options related to fetching</h3>
|
||
|
|
<div class="dlist">
|
||
|
|
<dl>
|
||
|
|
<dt class="hdlist1">--all</dt>
|
||
|
|
<dd>
|
||
|
|
<p>Fetch all remotes.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">-a</dt>
|
||
|
|
<dt class="hdlist1">--append</dt>
|
||
|
|
<dd>
|
||
|
|
<p>Append ref names and object names of fetched refs to the
|
||
|
|
existing contents of <code>.git/FETCH_HEAD</code>. Without this
|
||
|
|
option old data in <code>.git/FETCH_HEAD</code> will be overwritten.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">--depth=<depth></dt>
|
||
|
|
<dd>
|
||
|
|
<p>Limit fetching to the specified number of commits from the tip of
|
||
|
|
each remote branch history. If fetching to a <em>shallow</em> repository
|
||
|
|
created by <code>git clone</code> with <code>--depth=<depth></code> option (see
|
||
|
|
<a href="git-clone.html">git-clone</a>(1)), deepen or shorten the history to the specified
|
||
|
|
number of commits. Tags for the deepened commits are not fetched.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">--deepen=<depth></dt>
|
||
|
|
<dd>
|
||
|
|
<p>Similar to --depth, except it specifies the number of commits
|
||
|
|
from the current shallow boundary instead of from the tip of
|
||
|
|
each remote branch history.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">--shallow-since=<date></dt>
|
||
|
|
<dd>
|
||
|
|
<p>Deepen or shorten the history of a shallow repository to
|
||
|
|
include all reachable commits after <date>.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">--shallow-exclude=<revision></dt>
|
||
|
|
<dd>
|
||
|
|
<p>Deepen or shorten the history of a shallow repository to
|
||
|
|
exclude commits reachable from a specified remote branch or tag.
|
||
|
|
This option can be specified multiple times.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">--unshallow</dt>
|
||
|
|
<dd>
|
||
|
|
<p>If the source repository is complete, convert a shallow
|
||
|
|
repository to a complete one, removing all the limitations
|
||
|
|
imposed by shallow repositories.</p>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>If the source repository is shallow, fetch as much as possible so that
|
||
|
|
the current repository has the same history as the source repository.</p>
|
||
|
|
</div>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">--update-shallow</dt>
|
||
|
|
<dd>
|
||
|
|
<p>By default when fetching from a shallow repository,
|
||
|
|
<code>git fetch</code> refuses refs that require updating
|
||
|
|
.git/shallow. This option updates .git/shallow and accept such
|
||
|
|
refs.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">--negotiation-tip=<commit|glob></dt>
|
||
|
|
<dd>
|
||
|
|
<p>By default, Git will report, to the server, commits reachable
|
||
|
|
from all local refs to find common commits in an attempt to
|
||
|
|
reduce the size of the to-be-received packfile. If specified,
|
||
|
|
Git will only report commits reachable from the given tips.
|
||
|
|
This is useful to speed up fetches when the user knows which
|
||
|
|
local ref is likely to have commits in common with the
|
||
|
|
upstream ref being fetched.</p>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>This option may be specified more than once; if so, Git will report
|
||
|
|
commits reachable from any of the given commits.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>The argument to this option may be a glob on ref names, a ref, or the (possibly
|
||
|
|
abbreviated) SHA-1 of a commit. Specifying a glob is equivalent to specifying
|
||
|
|
this option multiple times, one for each matching ref name.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>See also the <code>fetch.negotiationAlgorithm</code> configuration variable
|
||
|
|
documented in <a href="git-config.html">git-config</a>(1).</p>
|
||
|
|
</div>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">-f</dt>
|
||
|
|
<dt class="hdlist1">--force</dt>
|
||
|
|
<dd>
|
||
|
|
<p>When <em>git fetch</em> is used with <code><src>:<dst></code> refspec it may
|
||
|
|
refuse to update the local branch as discussed
|
||
|
|
in the <code><refspec></code> part of the <a href="git-fetch.html">git-fetch</a>(1)
|
||
|
|
documentation.
|
||
|
|
This option overrides that check.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">-k</dt>
|
||
|
|
<dt class="hdlist1">--keep</dt>
|
||
|
|
<dd>
|
||
|
|
<p>Keep downloaded pack.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">--no-tags</dt>
|
||
|
|
<dd>
|
||
|
|
<p>By default, tags that point at objects that are downloaded
|
||
|
|
from the remote repository are fetched and stored locally.
|
||
|
|
This option disables this automatic tag following. The default
|
||
|
|
behavior for a remote may be specified with the remote.<name>.tagOpt
|
||
|
|
setting. See <a href="git-config.html">git-config</a>(1).</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">-u</dt>
|
||
|
|
<dt class="hdlist1">--update-head-ok</dt>
|
||
|
|
<dd>
|
||
|
|
<p>By default <em>git fetch</em> refuses to update the head which
|
||
|
|
corresponds to the current branch. This flag disables the
|
||
|
|
check. This is purely for the internal use for <em>git pull</em>
|
||
|
|
to communicate with <em>git fetch</em>, and unless you are
|
||
|
|
implementing your own Porcelain you are not supposed to
|
||
|
|
use it.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">--upload-pack <upload-pack></dt>
|
||
|
|
<dd>
|
||
|
|
<p>When given, and the repository to fetch from is handled
|
||
|
|
by <em>git fetch-pack</em>, <code>--exec=<upload-pack></code> is passed to
|
||
|
|
the command to specify non-default path for the command
|
||
|
|
run on the other end.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">--progress</dt>
|
||
|
|
<dd>
|
||
|
|
<p>Progress status is reported on the standard error stream
|
||
|
|
by default when it is attached to a terminal, unless -q
|
||
|
|
is specified. This flag forces progress status even if the
|
||
|
|
standard error stream is not directed to a terminal.</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">--ipv4</dt>
|
||
|
|
<dd>
|
||
|
|
<p>Use IPv4 addresses only, ignoring IPv6 addresses.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">-6</dt>
|
||
|
|
<dt class="hdlist1">--ipv6</dt>
|
||
|
|
<dd>
|
||
|
|
<p>Use IPv6 addresses only, ignoring IPv4 addresses.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1"><repository></dt>
|
||
|
|
<dd>
|
||
|
|
<p>The "remote" repository that is the source of a fetch
|
||
|
|
or pull operation. This parameter can be either a URL
|
||
|
|
(see the section <a href="#URLS">GIT URLS</a> below) or the name
|
||
|
|
of a remote (see the section <a href="#REMOTES">REMOTES</a> below).</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1"><refspec></dt>
|
||
|
|
<dd>
|
||
|
|
<p>Specifies which refs to fetch and which local refs to update.
|
||
|
|
When no <refspec>s appear on the command line, the refs to fetch
|
||
|
|
are read from <code>remote.<repository>.fetch</code> variables instead
|
||
|
|
(see <a href="git-fetch.html">git-fetch</a>(1)).</p>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>The format of a <refspec> parameter is an optional plus
|
||
|
|
<code>+</code>, followed by the source <src>, followed
|
||
|
|
by a colon <code>:</code>, followed by the destination ref <dst>.
|
||
|
|
The colon can be omitted when <dst> is empty. <src> is
|
||
|
|
typically a ref, but it can also be a fully spelled hex object
|
||
|
|
name.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p><code>tag <tag></code> means the same as <code>refs/tags/<tag>:refs/tags/<tag></code>;
|
||
|
|
it requests fetching everything up to the given tag.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>The remote ref that matches <src>
|
||
|
|
is fetched, and if <dst> is not an empty string, an attempt
|
||
|
|
is made to update the local ref that matches it.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>Whether that update is allowed without <code>--force</code> depends on the ref
|
||
|
|
namespace it’s being fetched to, the type of object being fetched, and
|
||
|
|
whether the update is considered to be a fast-forward. Generally, the
|
||
|
|
same rules apply for fetching as when pushing, see the <code><refspec>...</code>
|
||
|
|
section of <a href="git-push.html">git-push</a>(1) for what those are. Exceptions to those
|
||
|
|
rules particular to <em>git fetch</em> are noted below.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>Until Git version 2.20, and unlike when pushing with
|
||
|
|
<a href="git-push.html">git-push</a>(1), any updates to <code>refs/tags/*</code> would be accepted
|
||
|
|
without <code>+</code> in the refspec (or <code>--force</code>). When fetching, we promiscuously
|
||
|
|
considered all tag updates from a remote to be forced fetches. Since
|
||
|
|
Git version 2.20, fetching to update <code>refs/tags/*</code> works the same way
|
||
|
|
as when pushing. I.e. any updates will be rejected without <code>+</code> in the
|
||
|
|
refspec (or <code>--force</code>).</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>Unlike when pushing with <a href="git-push.html">git-push</a>(1), any updates outside of
|
||
|
|
<code>refs/{tags,heads}/*</code> will be accepted without <code>+</code> in the refspec (or
|
||
|
|
<code>--force</code>), whether that’s swapping e.g. a tree object for a blob, or
|
||
|
|
a commit for another commit that’s doesn’t have the previous commit as
|
||
|
|
an ancestor etc.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>Unlike when pushing with <a href="git-push.html">git-push</a>(1), there is no
|
||
|
|
configuration which’ll amend these rules, and nothing like a
|
||
|
|
<code>pre-fetch</code> hook analogous to the <code>pre-receive</code> hook.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>As with pushing with <a href="git-push.html">git-push</a>(1), all of the rules described
|
||
|
|
above about what’s not allowed as an update can be overridden by
|
||
|
|
adding an the optional leading <code>+</code> to a refspec (or using <code>--force</code>
|
||
|
|
command line option). The only exception to this is that no amount of
|
||
|
|
forcing will make the <code>refs/heads/*</code> namespace accept a non-commit
|
||
|
|
object.</p>
|
||
|
|
</div>
|
||
|
|
<div class="admonitionblock note">
|
||
|
|
<table>
|
||
|
|
<tr>
|
||
|
|
<td class="icon">
|
||
|
|
<div class="title">Note</div>
|
||
|
|
</td>
|
||
|
|
<td class="content">
|
||
|
|
When the remote branch you want to fetch is known to
|
||
|
|
be rewound and rebased regularly, it is expected that
|
||
|
|
its new tip will not be descendant of its previous tip
|
||
|
|
(as stored in your remote-tracking branch the last time
|
||
|
|
you fetched). You would want
|
||
|
|
to use the <code>+</code> sign to indicate non-fast-forward updates
|
||
|
|
will be needed for such branches. There is no way to
|
||
|
|
determine or declare that a branch will be made available
|
||
|
|
in a repository with this behavior; the pulling user simply
|
||
|
|
must know this is the expected usage pattern for a branch.
|
||
|
|
</td>
|
||
|
|
</tr>
|
||
|
|
</table>
|
||
|
|
</div>
|
||
|
|
<div class="admonitionblock note">
|
||
|
|
<table>
|
||
|
|
<tr>
|
||
|
|
<td class="icon">
|
||
|
|
<div class="title">Note</div>
|
||
|
|
</td>
|
||
|
|
<td class="content">
|
||
|
|
There is a difference between listing multiple <refspec>
|
||
|
|
directly on <em>git pull</em> command line and having multiple
|
||
|
|
<code>remote.<repository>.fetch</code> entries in your configuration
|
||
|
|
for a <repository> and running a
|
||
|
|
<em>git pull</em> command without any explicit <refspec> parameters.
|
||
|
|
<refspec>s listed explicitly on the command line are always
|
||
|
|
merged into the current branch after fetching. In other words,
|
||
|
|
if you list more than one remote ref, <em>git pull</em> will create
|
||
|
|
an Octopus merge. On the other hand, if you do not list any
|
||
|
|
explicit <refspec> parameter on the command line, <em>git pull</em>
|
||
|
|
will fetch all the <refspec>s it finds in the
|
||
|
|
<code>remote.<repository>.fetch</code> configuration and merge
|
||
|
|
only the first <refspec> found into the current branch.
|
||
|
|
This is because making an
|
||
|
|
Octopus from remote refs is rarely done, while keeping track
|
||
|
|
of multiple remote heads in one-go by fetching more than one
|
||
|
|
is often useful.
|
||
|
|
</td>
|
||
|
|
</tr>
|
||
|
|
</table>
|
||
|
|
</div>
|
||
|
|
</dd>
|
||
|
|
</dl>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sect1">
|
||
|
|
<h2 id="_git_urls">GIT URLS<a id="URLS"></a></h2>
|
||
|
|
<div class="sectionbody">
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>In general, URLs contain information about the transport protocol, the
|
||
|
|
address of the remote server, and the path to the repository.
|
||
|
|
Depending on the transport protocol, some of this information may be
|
||
|
|
absent.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>Git supports ssh, git, http, and https protocols (in addition, ftp,
|
||
|
|
and ftps can be used for fetching, but this is inefficient and
|
||
|
|
deprecated; do not use it).</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>The native transport (i.e. git:// URL) does no authentication and
|
||
|
|
should be used with caution on unsecured networks.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>The following syntaxes may be used with them:</p>
|
||
|
|
</div>
|
||
|
|
<div class="ulist">
|
||
|
|
<ul>
|
||
|
|
<li>
|
||
|
|
<p>ssh://[user@]host.xz[:port]/path/to/repo.git/</p>
|
||
|
|
</li>
|
||
|
|
<li>
|
||
|
|
<p>git://host.xz[:port]/path/to/repo.git/</p>
|
||
|
|
</li>
|
||
|
|
<li>
|
||
|
|
<p>http[s]://host.xz[:port]/path/to/repo.git/</p>
|
||
|
|
</li>
|
||
|
|
<li>
|
||
|
|
<p>ftp[s]://host.xz[:port]/path/to/repo.git/</p>
|
||
|
|
</li>
|
||
|
|
</ul>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>An alternative scp-like syntax may also be used with the ssh protocol:</p>
|
||
|
|
</div>
|
||
|
|
<div class="ulist">
|
||
|
|
<ul>
|
||
|
|
<li>
|
||
|
|
<p>[user@]host.xz:path/to/repo.git/</p>
|
||
|
|
</li>
|
||
|
|
</ul>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>This syntax is only recognized if there are no slashes before the
|
||
|
|
first colon. This helps differentiate a local path that contains a
|
||
|
|
colon. For example the local path <code>foo:bar</code> could be specified as an
|
||
|
|
absolute path or <code>./foo:bar</code> to avoid being misinterpreted as an ssh
|
||
|
|
url.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>The ssh and git protocols additionally support ~username expansion:</p>
|
||
|
|
</div>
|
||
|
|
<div class="ulist">
|
||
|
|
<ul>
|
||
|
|
<li>
|
||
|
|
<p>ssh://[user@]host.xz[:port]/~[user]/path/to/repo.git/</p>
|
||
|
|
</li>
|
||
|
|
<li>
|
||
|
|
<p>git://host.xz[:port]/~[user]/path/to/repo.git/</p>
|
||
|
|
</li>
|
||
|
|
<li>
|
||
|
|
<p>[user@]host.xz:/~[user]/path/to/repo.git/</p>
|
||
|
|
</li>
|
||
|
|
</ul>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>For local repositories, also supported by Git natively, the following
|
||
|
|
syntaxes may be used:</p>
|
||
|
|
</div>
|
||
|
|
<div class="ulist">
|
||
|
|
<ul>
|
||
|
|
<li>
|
||
|
|
<p>/path/to/repo.git/</p>
|
||
|
|
</li>
|
||
|
|
<li>
|
||
|
|
<p>file:///path/to/repo.git/</p>
|
||
|
|
</li>
|
||
|
|
</ul>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>These two syntaxes are mostly equivalent, except when cloning, when
|
||
|
|
the former implies --local option. See <a href="git-clone.html">git-clone</a>(1) for
|
||
|
|
details.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>When Git doesn’t know how to handle a certain transport protocol, it
|
||
|
|
attempts to use the <em>remote-<transport></em> remote helper, if one
|
||
|
|
exists. To explicitly request a remote helper, the following syntax
|
||
|
|
may be used:</p>
|
||
|
|
</div>
|
||
|
|
<div class="ulist">
|
||
|
|
<ul>
|
||
|
|
<li>
|
||
|
|
<p><transport>::<address></p>
|
||
|
|
</li>
|
||
|
|
</ul>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>where <address> may be a path, a server and path, or an arbitrary
|
||
|
|
URL-like string recognized by the specific remote helper being
|
||
|
|
invoked. See <a href="gitremote-helpers.html">gitremote-helpers</a>(1) for details.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>If there are a large number of similarly-named remote repositories and
|
||
|
|
you want to use a different format for them (such that the URLs you
|
||
|
|
use will be rewritten into URLs that work), you can create a
|
||
|
|
configuration section of the form:</p>
|
||
|
|
</div>
|
||
|
|
<div class="listingblock">
|
||
|
|
<div class="content">
|
||
|
|
<pre> [url "<actual url base>"]
|
||
|
|
insteadOf = <other url base></pre>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>For example, with this:</p>
|
||
|
|
</div>
|
||
|
|
<div class="listingblock">
|
||
|
|
<div class="content">
|
||
|
|
<pre> [url "git://git.host.xz/"]
|
||
|
|
insteadOf = host.xz:/path/to/
|
||
|
|
insteadOf = work:</pre>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be
|
||
|
|
rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>If you want to rewrite URLs for push only, you can create a
|
||
|
|
configuration section of the form:</p>
|
||
|
|
</div>
|
||
|
|
<div class="listingblock">
|
||
|
|
<div class="content">
|
||
|
|
<pre> [url "<actual url base>"]
|
||
|
|
pushInsteadOf = <other url base></pre>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>For example, with this:</p>
|
||
|
|
</div>
|
||
|
|
<div class="listingblock">
|
||
|
|
<div class="content">
|
||
|
|
<pre> [url "ssh://example.org/"]
|
||
|
|
pushInsteadOf = git://example.org/</pre>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>a URL like "git://example.org/path/to/repo.git" will be rewritten to
|
||
|
|
"ssh://example.org/path/to/repo.git" for pushes, but pulls will still
|
||
|
|
use the original URL.</p>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sect1">
|
||
|
|
<h2 id="_remotes">REMOTES<a id="REMOTES"></a></h2>
|
||
|
|
<div class="sectionbody">
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>The name of one of the following can be used instead
|
||
|
|
of a URL as <code><repository></code> argument:</p>
|
||
|
|
</div>
|
||
|
|
<div class="ulist">
|
||
|
|
<ul>
|
||
|
|
<li>
|
||
|
|
<p>a remote in the Git configuration file: <code>$GIT_DIR/config</code>,</p>
|
||
|
|
</li>
|
||
|
|
<li>
|
||
|
|
<p>a file in the <code>$GIT_DIR/remotes</code> directory, or</p>
|
||
|
|
</li>
|
||
|
|
<li>
|
||
|
|
<p>a file in the <code>$GIT_DIR/branches</code> directory.</p>
|
||
|
|
</li>
|
||
|
|
</ul>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>All of these also allow you to omit the refspec from the command line
|
||
|
|
because they each contain a refspec which git will use by default.</p>
|
||
|
|
</div>
|
||
|
|
<div class="sect2">
|
||
|
|
<h3 id="_named_remote_in_configuration_file">Named remote in configuration file</h3>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>You can choose to provide the name of a remote which you had previously
|
||
|
|
configured using <a href="git-remote.html">git-remote</a>(1), <a href="git-config.html">git-config</a>(1)
|
||
|
|
or even by a manual edit to the <code>$GIT_DIR/config</code> file. The URL of
|
||
|
|
this remote will be used to access the repository. The refspec
|
||
|
|
of this remote will be used by default when you do
|
||
|
|
not provide a refspec on the command line. The entry in the
|
||
|
|
config file would appear like this:</p>
|
||
|
|
</div>
|
||
|
|
<div class="listingblock">
|
||
|
|
<div class="content">
|
||
|
|
<pre> [remote "<name>"]
|
||
|
|
url = <url>
|
||
|
|
pushurl = <pushurl>
|
||
|
|
push = <refspec>
|
||
|
|
fetch = <refspec></pre>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>The <code><pushurl></code> is used for pushes only. It is optional and defaults
|
||
|
|
to <code><url></code>.</p>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sect2">
|
||
|
|
<h3 id="_named_file_in_git_dirremotes">Named file in <code>$GIT_DIR/remotes</code></h3>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>You can choose to provide the name of a
|
||
|
|
file in <code>$GIT_DIR/remotes</code>. The URL
|
||
|
|
in this file will be used to access the repository. The refspec
|
||
|
|
in this file will be used as default when you do not
|
||
|
|
provide a refspec on the command line. This file should have the
|
||
|
|
following format:</p>
|
||
|
|
</div>
|
||
|
|
<div class="listingblock">
|
||
|
|
<div class="content">
|
||
|
|
<pre> URL: one of the above URL format
|
||
|
|
Push: <refspec>
|
||
|
|
Pull: <refspec></pre>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p><code>Push:</code> lines are used by <em>git push</em> and
|
||
|
|
<code>Pull:</code> lines are used by <em>git pull</em> and <em>git fetch</em>.
|
||
|
|
Multiple <code>Push:</code> and <code>Pull:</code> lines may
|
||
|
|
be specified for additional branch mappings.</p>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sect2">
|
||
|
|
<h3 id="_named_file_in_git_dirbranches">Named file in <code>$GIT_DIR/branches</code></h3>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>You can choose to provide the name of a
|
||
|
|
file in <code>$GIT_DIR/branches</code>.
|
||
|
|
The URL in this file will be used to access the repository.
|
||
|
|
This file should have the following format:</p>
|
||
|
|
</div>
|
||
|
|
<div class="listingblock">
|
||
|
|
<div class="content">
|
||
|
|
<pre> <url>#<head></pre>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p><code><url></code> is required; <code>#<head></code> is optional.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>Depending on the operation, git will use one of the following
|
||
|
|
refspecs, if you don’t provide one on the command line.
|
||
|
|
<code><branch></code> is the name of this file in <code>$GIT_DIR/branches</code> and
|
||
|
|
<code><head></code> defaults to <code>master</code>.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>git fetch uses:</p>
|
||
|
|
</div>
|
||
|
|
<div class="listingblock">
|
||
|
|
<div class="content">
|
||
|
|
<pre> refs/heads/<head>:refs/heads/<branch></pre>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>git push uses:</p>
|
||
|
|
</div>
|
||
|
|
<div class="listingblock">
|
||
|
|
<div class="content">
|
||
|
|
<pre> HEAD:refs/heads/<head></pre>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sect1">
|
||
|
|
<h2 id="_merge_strategies">MERGE STRATEGIES</h2>
|
||
|
|
<div class="sectionbody">
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>The merge mechanism (<code>git merge</code> and <code>git pull</code> commands) allows the
|
||
|
|
backend <em>merge strategies</em> to be chosen with <code>-s</code> option. Some strategies
|
||
|
|
can also take their own options, which can be passed by giving <code>-X<option></code>
|
||
|
|
arguments to <code>git merge</code> and/or <code>git pull</code>.</p>
|
||
|
|
</div>
|
||
|
|
<div class="dlist">
|
||
|
|
<dl>
|
||
|
|
<dt class="hdlist1">resolve</dt>
|
||
|
|
<dd>
|
||
|
|
<p>This can only resolve two heads (i.e. the current branch
|
||
|
|
and another branch you pulled from) using a 3-way merge
|
||
|
|
algorithm. It tries to carefully detect criss-cross
|
||
|
|
merge ambiguities and is considered generally safe and
|
||
|
|
fast.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">recursive</dt>
|
||
|
|
<dd>
|
||
|
|
<p>This can only resolve two heads using a 3-way merge
|
||
|
|
algorithm. When there is more than one common
|
||
|
|
ancestor that can be used for 3-way merge, it creates a
|
||
|
|
merged tree of the common ancestors and uses that as
|
||
|
|
the reference tree for the 3-way merge. This has been
|
||
|
|
reported to result in fewer merge conflicts without
|
||
|
|
causing mismerges by tests done on actual merge commits
|
||
|
|
taken from Linux 2.6 kernel development history.
|
||
|
|
Additionally this can detect and handle merges involving
|
||
|
|
renames, but currently cannot make use of detected
|
||
|
|
copies. This is the default merge strategy when pulling
|
||
|
|
or merging one branch.</p>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>The <em>recursive</em> strategy can take the following options:</p>
|
||
|
|
</div>
|
||
|
|
<div class="dlist">
|
||
|
|
<dl>
|
||
|
|
<dt class="hdlist1">ours</dt>
|
||
|
|
<dd>
|
||
|
|
<p>This option forces conflicting hunks to be auto-resolved cleanly by
|
||
|
|
favoring <em>our</em> version. Changes from the other tree that do not
|
||
|
|
conflict with our side are reflected to the merge result.
|
||
|
|
For a binary file, the entire contents are taken from our side.</p>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>This should not be confused with the <em>ours</em> merge strategy, which does not
|
||
|
|
even look at what the other tree contains at all. It discards everything
|
||
|
|
the other tree did, declaring <em>our</em> history contains all that happened in it.</p>
|
||
|
|
</div>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">theirs</dt>
|
||
|
|
<dd>
|
||
|
|
<p>This is the opposite of <em>ours</em>; note that, unlike <em>ours</em>, there is
|
||
|
|
no <em>theirs</em> merge strategy to confuse this merge option with.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">patience</dt>
|
||
|
|
<dd>
|
||
|
|
<p>With this option, <em>merge-recursive</em> spends a little extra time
|
||
|
|
to avoid mismerges that sometimes occur due to unimportant
|
||
|
|
matching lines (e.g., braces from distinct functions). Use
|
||
|
|
this when the branches to be merged have diverged wildly.
|
||
|
|
See also <a href="git-diff.html">git-diff</a>(1) <code>--patience</code>.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">diff-algorithm=[patience|minimal|histogram|myers]</dt>
|
||
|
|
<dd>
|
||
|
|
<p>Tells <em>merge-recursive</em> to use a different diff algorithm, which
|
||
|
|
can help avoid mismerges that occur due to unimportant matching
|
||
|
|
lines (such as braces from distinct functions). See also
|
||
|
|
<a href="git-diff.html">git-diff</a>(1) <code>--diff-algorithm</code>.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">ignore-space-change</dt>
|
||
|
|
<dt class="hdlist1">ignore-all-space</dt>
|
||
|
|
<dt class="hdlist1">ignore-space-at-eol</dt>
|
||
|
|
<dt class="hdlist1">ignore-cr-at-eol</dt>
|
||
|
|
<dd>
|
||
|
|
<p>Treats lines with the indicated type of whitespace change as
|
||
|
|
unchanged for the sake of a three-way merge. Whitespace
|
||
|
|
changes mixed with other changes to a line are not ignored.
|
||
|
|
See also <a href="git-diff.html">git-diff</a>(1) <code>-b</code>, <code>-w</code>,
|
||
|
|
<code>--ignore-space-at-eol</code>, and <code>--ignore-cr-at-eol</code>.</p>
|
||
|
|
<div class="ulist">
|
||
|
|
<ul>
|
||
|
|
<li>
|
||
|
|
<p>If <em>their</em> version only introduces whitespace changes to a line,
|
||
|
|
<em>our</em> version is used;</p>
|
||
|
|
</li>
|
||
|
|
<li>
|
||
|
|
<p>If <em>our</em> version introduces whitespace changes but <em>their</em>
|
||
|
|
version includes a substantial change, <em>their</em> version is used;</p>
|
||
|
|
</li>
|
||
|
|
<li>
|
||
|
|
<p>Otherwise, the merge proceeds in the usual way.</p>
|
||
|
|
</li>
|
||
|
|
</ul>
|
||
|
|
</div>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">renormalize</dt>
|
||
|
|
<dd>
|
||
|
|
<p>This runs a virtual check-out and check-in of all three stages
|
||
|
|
of a file when resolving a three-way merge. This option is
|
||
|
|
meant to be used when merging branches with different clean
|
||
|
|
filters or end-of-line normalization rules. See "Merging
|
||
|
|
branches with differing checkin/checkout attributes" in
|
||
|
|
<a href="gitattributes.html">gitattributes</a>(5) for details.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">no-renormalize</dt>
|
||
|
|
<dd>
|
||
|
|
<p>Disables the <code>renormalize</code> option. This overrides the
|
||
|
|
<code>merge.renormalize</code> configuration variable.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">no-renames</dt>
|
||
|
|
<dd>
|
||
|
|
<p>Turn off rename detection. This overrides the <code>merge.renames</code>
|
||
|
|
configuration variable.
|
||
|
|
See also <a href="git-diff.html">git-diff</a>(1) <code>--no-renames</code>.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">find-renames[=<n>]</dt>
|
||
|
|
<dd>
|
||
|
|
<p>Turn on rename detection, optionally setting the similarity
|
||
|
|
threshold. This is the default. This overrides the
|
||
|
|
<em>merge.renames</em> configuration variable.
|
||
|
|
See also <a href="git-diff.html">git-diff</a>(1) <code>--find-renames</code>.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">rename-threshold=<n></dt>
|
||
|
|
<dd>
|
||
|
|
<p>Deprecated synonym for <code>find-renames=<n></code>.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">subtree[=<path>]</dt>
|
||
|
|
<dd>
|
||
|
|
<p>This option is a more advanced form of <em>subtree</em> strategy, where
|
||
|
|
the strategy makes a guess on how two trees must be shifted to
|
||
|
|
match with each other when merging. Instead, the specified path
|
||
|
|
is prefixed (or stripped from the beginning) to make the shape of
|
||
|
|
two trees to match.</p>
|
||
|
|
</dd>
|
||
|
|
</dl>
|
||
|
|
</div>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">octopus</dt>
|
||
|
|
<dd>
|
||
|
|
<p>This resolves cases with more than two heads, but refuses to do
|
||
|
|
a complex merge that needs manual resolution. It is
|
||
|
|
primarily meant to be used for bundling topic branch
|
||
|
|
heads together. This is the default merge strategy when
|
||
|
|
pulling or merging more than one branch.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">ours</dt>
|
||
|
|
<dd>
|
||
|
|
<p>This resolves any number of heads, but the resulting tree of the
|
||
|
|
merge is always that of the current branch head, effectively
|
||
|
|
ignoring all changes from all other branches. It is meant to
|
||
|
|
be used to supersede old development history of side
|
||
|
|
branches. Note that this is different from the -Xours option to
|
||
|
|
the <em>recursive</em> merge strategy.</p>
|
||
|
|
</dd>
|
||
|
|
<dt class="hdlist1">subtree</dt>
|
||
|
|
<dd>
|
||
|
|
<p>This is a modified recursive strategy. When merging trees A and
|
||
|
|
B, if B corresponds to a subtree of A, B is first adjusted to
|
||
|
|
match the tree structure of A, instead of reading the trees at
|
||
|
|
the same level. This adjustment is also done to the common
|
||
|
|
ancestor tree.</p>
|
||
|
|
</dd>
|
||
|
|
</dl>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>With the strategies that use 3-way merge (including the default, <em>recursive</em>),
|
||
|
|
if a change is made on both branches, but later reverted on one of the
|
||
|
|
branches, that change will be present in the merged result; some people find
|
||
|
|
this behavior confusing. It occurs because only the heads and the merge base
|
||
|
|
are considered when performing a merge, not the individual commits. The merge
|
||
|
|
algorithm therefore considers the reverted change as no change at all, and
|
||
|
|
substitutes the changed version instead.</p>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sect1">
|
||
|
|
<h2 id="_default_behaviour">DEFAULT BEHAVIOUR</h2>
|
||
|
|
<div class="sectionbody">
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>Often people use <code>git pull</code> without giving any parameter.
|
||
|
|
Traditionally, this has been equivalent to saying <code>git pull
|
||
|
|
origin</code>. However, when configuration <code>branch.<name>.remote</code> is
|
||
|
|
present while on branch <code><name></code>, that value is used instead of
|
||
|
|
<code>origin</code>.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>In order to determine what URL to use to fetch from, the value
|
||
|
|
of the configuration <code>remote.<origin>.url</code> is consulted
|
||
|
|
and if there is not any such variable, the value on the <code>URL:</code> line
|
||
|
|
in <code>$GIT_DIR/remotes/<origin></code> is used.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>In order to determine what remote branches to fetch (and
|
||
|
|
optionally store in the remote-tracking branches) when the command is
|
||
|
|
run without any refspec parameters on the command line, values
|
||
|
|
of the configuration variable <code>remote.<origin>.fetch</code> are
|
||
|
|
consulted, and if there aren’t any, <code>$GIT_DIR/remotes/<origin></code>
|
||
|
|
is consulted and its <code>Pull:</code> lines are used.
|
||
|
|
In addition to the refspec formats described in the OPTIONS
|
||
|
|
section, you can have a globbing refspec that looks like this:</p>
|
||
|
|
</div>
|
||
|
|
<div class="listingblock">
|
||
|
|
<div class="content">
|
||
|
|
<pre>refs/heads/*:refs/remotes/origin/*</pre>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>A globbing refspec must have a non-empty RHS (i.e. must store
|
||
|
|
what were fetched in remote-tracking branches), and its LHS and RHS
|
||
|
|
must end with <code>/*</code>. The above specifies that all remote
|
||
|
|
branches are tracked using remote-tracking branches in
|
||
|
|
<code>refs/remotes/origin/</code> hierarchy under the same name.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>The rule to determine which remote branch to merge after
|
||
|
|
fetching is a bit involved, in order not to break backward
|
||
|
|
compatibility.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>If explicit refspecs were given on the command
|
||
|
|
line of <code>git pull</code>, they are all merged.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>When no refspec was given on the command line, then <code>git pull</code>
|
||
|
|
uses the refspec from the configuration or
|
||
|
|
<code>$GIT_DIR/remotes/<origin></code>. In such cases, the following
|
||
|
|
rules apply:</p>
|
||
|
|
</div>
|
||
|
|
<div class="olist arabic">
|
||
|
|
<ol class="arabic">
|
||
|
|
<li>
|
||
|
|
<p>If <code>branch.<name>.merge</code> configuration for the current
|
||
|
|
branch <code><name></code> exists, that is the name of the branch at the
|
||
|
|
remote site that is merged.</p>
|
||
|
|
</li>
|
||
|
|
<li>
|
||
|
|
<p>If the refspec is a globbing one, nothing is merged.</p>
|
||
|
|
</li>
|
||
|
|
<li>
|
||
|
|
<p>Otherwise the remote branch of the first refspec is merged.</p>
|
||
|
|
</li>
|
||
|
|
</ol>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sect1">
|
||
|
|
<h2 id="_examples">EXAMPLES</h2>
|
||
|
|
<div class="sectionbody">
|
||
|
|
<div class="ulist">
|
||
|
|
<ul>
|
||
|
|
<li>
|
||
|
|
<p>Update the remote-tracking branches for the repository
|
||
|
|
you cloned from, then merge one of them into your
|
||
|
|
current branch:</p>
|
||
|
|
<div class="listingblock">
|
||
|
|
<div class="content">
|
||
|
|
<pre>$ git pull
|
||
|
|
$ git pull origin</pre>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>Normally the branch merged in is the HEAD of the remote repository,
|
||
|
|
but the choice is determined by the branch.<name>.remote and
|
||
|
|
branch.<name>.merge options; see <a href="git-config.html">git-config</a>(1) for details.</p>
|
||
|
|
</div>
|
||
|
|
</li>
|
||
|
|
<li>
|
||
|
|
<p>Merge into the current branch the remote branch <code>next</code>:</p>
|
||
|
|
<div class="listingblock">
|
||
|
|
<div class="content">
|
||
|
|
<pre>$ git pull origin next</pre>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>This leaves a copy of <code>next</code> temporarily in FETCH_HEAD, but
|
||
|
|
does not update any remote-tracking branches. Using remote-tracking
|
||
|
|
branches, the same can be done by invoking fetch and merge:</p>
|
||
|
|
</div>
|
||
|
|
<div class="listingblock">
|
||
|
|
<div class="content">
|
||
|
|
<pre>$ git fetch origin
|
||
|
|
$ git merge origin/next</pre>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
</li>
|
||
|
|
</ul>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>If you tried a pull which resulted in complex conflicts and
|
||
|
|
would want to start over, you can recover with <em>git reset</em>.</p>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sect1">
|
||
|
|
<h2 id="_security">SECURITY</h2>
|
||
|
|
<div class="sectionbody">
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>The fetch and push protocols are not designed to prevent one side from
|
||
|
|
stealing data from the other repository that was not intended to be
|
||
|
|
shared. If you have private data that you need to protect from a malicious
|
||
|
|
peer, your best option is to store it in another repository. This applies
|
||
|
|
to both clients and servers. In particular, namespaces on a server are not
|
||
|
|
effective for read access control; you should only grant read access to a
|
||
|
|
namespace to clients that you would trust with read access to the entire
|
||
|
|
repository.</p>
|
||
|
|
</div>
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>The known attack vectors are as follows:</p>
|
||
|
|
</div>
|
||
|
|
<div class="olist arabic">
|
||
|
|
<ol class="arabic">
|
||
|
|
<li>
|
||
|
|
<p>The victim sends "have" lines advertising the IDs of objects it has that
|
||
|
|
are not explicitly intended to be shared but can be used to optimize the
|
||
|
|
transfer if the peer also has them. The attacker chooses an object ID X
|
||
|
|
to steal and sends a ref to X, but isn’t required to send the content of
|
||
|
|
X because the victim already has it. Now the victim believes that the
|
||
|
|
attacker has X, and it sends the content of X back to the attacker
|
||
|
|
later. (This attack is most straightforward for a client to perform on a
|
||
|
|
server, by creating a ref to X in the namespace the client has access
|
||
|
|
to and then fetching it. The most likely way for a server to perform it
|
||
|
|
on a client is to "merge" X into a public branch and hope that the user
|
||
|
|
does additional work on this branch and pushes it back to the server
|
||
|
|
without noticing the merge.)</p>
|
||
|
|
</li>
|
||
|
|
<li>
|
||
|
|
<p>As in #1, the attacker chooses an object ID X to steal. The victim sends
|
||
|
|
an object Y that the attacker already has, and the attacker falsely
|
||
|
|
claims to have X and not Y, so the victim sends Y as a delta against X.
|
||
|
|
The delta reveals regions of X that are similar to Y to the attacker.</p>
|
||
|
|
</li>
|
||
|
|
</ol>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sect1">
|
||
|
|
<h2 id="_bugs">BUGS</h2>
|
||
|
|
<div class="sectionbody">
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>Using --recurse-submodules can only fetch new commits in already checked
|
||
|
|
out submodules right now. When e.g. upstream added a new submodule in the
|
||
|
|
just fetched commits of the superproject the submodule itself can not be
|
||
|
|
fetched, making it impossible to check out that submodule later without
|
||
|
|
having to do a fetch again. This is expected to be fixed in a future Git
|
||
|
|
version.</p>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sect1">
|
||
|
|
<h2 id="_see_also">SEE ALSO</h2>
|
||
|
|
<div class="sectionbody">
|
||
|
|
<div class="paragraph">
|
||
|
|
<p><a href="git-fetch.html">git-fetch</a>(1), <a href="git-merge.html">git-merge</a>(1), <a href="git-config.html">git-config</a>(1)</p>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div class="sect1">
|
||
|
|
<h2 id="_git">GIT</h2>
|
||
|
|
<div class="sectionbody">
|
||
|
|
<div class="paragraph">
|
||
|
|
<p>Part of the <a href="git.html">git</a>(1) suite</p>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
<div id="footer">
|
||
|
|
<div id="footer-text">
|
||
|
|
Last updated 2019-02-26 19:31:11 UTC
|
||
|
|
</div>
|
||
|
|
</div>
|
||
|
|
</body>
|
||
|
|
</html>
|