<!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">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[117972] trunk/dports/devel/git-core</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/117972">117972</a></dd>
<dt>Author</dt> <dd>ciserlohn@macports.org</dd>
<dt>Date</dt> <dd>2014-03-17 14:19:06 -0700 (Mon, 17 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>git-core: update to version 1.9.0</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelgitcorePortfile">trunk/dports/devel/git-core/Portfile</a></li>
<li><a href="#trunkdportsdevelgitcorefilesgitsubtree1diff">trunk/dports/devel/git-core/files/git-subtree.1.diff</a></li>
<li><a href="#trunkdportsdevelgitcorefilesgitsubtreehtmldiff">trunk/dports/devel/git-core/files/git-subtree.html.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelgitcorePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/git-core/Portfile (117971 => 117972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/git-core/Portfile 2014-03-17 20:53:18 UTC (rev 117971)
+++ trunk/dports/devel/git-core/Portfile 2014-03-17 21:19:06 UTC (rev 117972)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name git-core
</span><del>-version 1.8.5.5
</del><ins>+version 1.9.0
</ins><span class="cx"> description A fast version control system
</span><span class="cx"> long_description Git is a fast, scalable, distributed open source version \
</span><span class="cx"> control system focusing on speed and efficiency.
</span><span class="lines">@@ -19,11 +19,11 @@
</span><span class="cx"> git-manpages-${version}${extract.suffix}
</span><span class="cx">
</span><span class="cx"> checksums git-${version}${extract.suffix} \
</span><del>- rmd160 46becd9525b669bea82b04df2003cfe059732bd9 \
- sha256 8524db697dbc2bad256fcfe6df1b2af67009c1438523cc82566311b0c7bf11da \
</del><ins>+ rmd160 bc8d4046749bf256494d6fc8f3a92e9c4d57aba6 \
+ sha256 de3097fdc36d624ea6cf4bb853402fde781acdb860f12152c5eb879777389882 \
</ins><span class="cx"> git-manpages-${version}${extract.suffix} \
</span><del>- rmd160 559af70cae635b52ed1c5d144e0afad13287a4a4 \
- sha256 b3673f1b0f35150c2a8a58c59d568c8560a896bc4c74154240a5a2ef69594d04 \
</del><ins>+ rmd160 4cbdcc81d196b0ac9e79fe5bc5b98f85bddb39d0 \
+ sha256 a51e2b64a8adde39e774f052843e0f513b5d3318492b515e752e339b0d3a85c7 \
</ins><span class="cx">
</span><span class="cx"> depends_run port:rsync
</span><span class="cx">
</span><span class="lines">@@ -157,8 +157,8 @@
</span><span class="cx"> variant doc description {Install HTML and plaintext documentation} {
</span><span class="cx"> distfiles-append git-htmldocs-${version}${extract.suffix}
</span><span class="cx"> checksums-append git-htmldocs-${version}${extract.suffix} \
</span><del>- rmd160 4617e63299477bf6a7b5791faca789300d0d3828 \
- sha256 3ff3b0b89834d20c0ecdf54d772dbab0f9a4871c4e8e7bff3021e27f74fb6d40
</del><ins>+ rmd160 23503762371c8f4605eb68f4a7485f80ca440d76 \
+ sha256 e4e619b7dd5b24ab4ef17e598803497704aa5b0a7821bb544940f2cdd7cac60e
</ins><span class="cx">
</span><span class="cx"> patchfiles-append git-subtree.html.diff
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsdevelgitcorefilesgitsubtree1diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/git-core/files/git-subtree.1.diff (117971 => 117972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/git-core/files/git-subtree.1.diff 2014-03-17 20:53:18 UTC (rev 117971)
+++ trunk/dports/devel/git-core/files/git-subtree.1.diff 2014-03-17 21:19:06 UTC (rev 117972)
</span><span class="lines">@@ -1,16 +1,17 @@
</span><ins>+diff -urN a/contrib/subtree/git-subtree.1 b/contrib/subtree/git-subtree.1
</ins><span class="cx"> --- a/contrib/subtree/git-subtree.1 1970-01-01 01:00:00.000000000 +0100
</span><del>-+++ b/contrib/subtree/git-subtree.1 2013-05-11 15:29:35.000000000 +0200
-@@ -0,0 +1,607 @@
</del><ins>++++ b/contrib/subtree/git-subtree.1 2014-03-17 22:04:30.000000000 +0100
+@@ -0,0 +1,606 @@
</ins><span class="cx"> +'\" t
</span><span class="cx"> +.\" Title: git-subtree
</span><span class="cx"> +.\" Author: [see the "AUTHOR" section]
</span><span class="cx"> +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
</span><del>-+.\" Date: 02/21/2014
</del><ins>++.\" Date: 03/17/2014
</ins><span class="cx"> +.\" Manual: Git Manual
</span><del>-+.\" Source: Git 1.8.5.5
</del><ins>++.\" Source: Git 1.9.0
</ins><span class="cx"> +.\" Language: English
</span><span class="cx"> +.\"
</span><del>-+.TH "GIT\-SUBTREE" "1" "02/21/2014" "Git 1\&.8\&.5\&.5" "Git Manual"
</del><ins>++.TH "GIT\-SUBTREE" "1" "03/17/2014" "Git 1\&.9\&.0" "Git Manual"
</ins><span class="cx"> +.\" -----------------------------------------------------------------
</span><span class="cx"> +.\" * Define some portability stuff
</span><span class="cx"> +.\" -----------------------------------------------------------------
</span><span class="lines">@@ -35,14 +36,13 @@
</span><span class="cx"> +.SH "SYNOPSIS"
</span><span class="cx"> +.sp
</span><span class="cx"> +.nf
</span><del>-+\fIgit subtree\fR add \-P <prefix> <refspec>
-+\fIgit subtree\fR add \-P <prefix> <repository> <refspec>
-+\fIgit subtree\fR pull \-P <prefix> <repository> <refspec\&...>
-+\fIgit subtree\fR push \-P <prefix> <repository> <refspec\&...>
</del><ins>++\fIgit subtree\fR add \-P <prefix> <commit>
++\fIgit subtree\fR add \-P <prefix> <repository> <ref>
++\fIgit subtree\fR pull \-P <prefix> <repository> <ref>
++\fIgit subtree\fR push \-P <prefix> <repository> <ref>
</ins><span class="cx"> +\fIgit subtree\fR merge \-P <prefix> <commit>
</span><span class="cx"> +\fIgit subtree\fR split \-P <prefix> [OPTIONS] [<commit>]
</span><span class="cx"> +.fi
</span><del>-+.sp
</del><span class="cx"> +.SH "DESCRIPTION"
</span><span class="cx"> +.sp
</span><span class="cx"> +Subtrees allow subprojects to be included within a subdirectory of the main project, optionally including the subproject\(cqs entire history\&.
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> +.PP
</span><span class="cx"> +add
</span><span class="cx"> +.RS 4
</span><del>-+Create the <prefix> subtree by importing its contents from the given <refspec> or <repository> and remote <refspec>\&. A new commit is created automatically, joining the imported project\(cqs history with your own\&. With
</del><ins>++Create the <prefix> subtree by importing its contents from the given <commit> or <repository> and remote <ref>\&. A new commit is created automatically, joining the imported project\(cqs history with your own\&. With
</ins><span class="cx"> +\fI\-\-squash\fR, imports only a single commit from the subproject, rather than its entire history\&.
</span><span class="cx"> +.RE
</span><span class="cx"> +.PP
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> +Exactly like
</span><span class="cx"> +\fImerge\fR, but parallels
</span><span class="cx"> +\fIgit pull\fR
</span><del>-+in that it fetches the given commit from the specified remote repository\&.
</del><ins>++in that it fetches the given ref from the specified remote repository\&.
</ins><span class="cx"> +.RE
</span><span class="cx"> +.PP
</span><span class="cx"> +push
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> +\fIsplit\fR
</span><span class="cx"> +(see below) using the <prefix> supplied and then does a
</span><span class="cx"> +\fIgit push\fR
</span><del>-+to push the result to the repository and refspec\&. This can be used to push your subtree to different branches of the remote repository\&.
</del><ins>++to push the result to the repository and ref\&. This can be used to push your subtree to different branches of the remote repository\&.
</ins><span class="cx"> +.RE
</span><span class="cx"> +.PP
</span><span class="cx"> +split
</span><span class="lines">@@ -433,7 +433,7 @@
</span><span class="cx"> +.sp
</span><span class="cx"> +\fImaster\fR needs to be a valid remote ref and can be a different branch name
</span><span class="cx"> +.sp
</span><del>-+You can omit the \-\-squash flag, but doing so will increase the number of commits that are incldued in your local repository\&.
</del><ins>++You can omit the \-\-squash flag, but doing so will increase the number of commits that are included in your local repository\&.
</ins><span class="cx"> +.sp
</span><span class="cx"> +We now have a ~/git\-extensions/git\-subtree directory containing code from the master branch of git://github\&.com/apenwarr/git\-subtree\&.git in our git\-extensions repository\&.
</span><span class="cx"> +.SH "EXAMPLE 2. EXTRACT A SUBTREE USING COMMIT, MERGE AND PULL"
</span></span></pre></div>
<a id="trunkdportsdevelgitcorefilesgitsubtreehtmldiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/git-core/files/git-subtree.html.diff (117971 => 117972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/git-core/files/git-subtree.html.diff 2014-03-17 20:53:18 UTC (rev 117971)
+++ trunk/dports/devel/git-core/files/git-subtree.html.diff 2014-03-17 21:19:06 UTC (rev 117972)
</span><span class="lines">@@ -1,12 +1,13 @@
</span><ins>+diff -urN a/contrib/subtree/git-subtree.html b/contrib/subtree/git-subtree.html
</ins><span class="cx"> --- a/contrib/subtree/git-subtree.html 1970-01-01 01:00:00.000000000 +0100
</span><del>-+++ b/contrib/subtree/git-subtree.html 2013-05-11 15:24:13.000000000 +0200
-@@ -0,0 +1,1276 @@
</del><ins>++++ b/contrib/subtree/git-subtree.html 2014-03-17 22:03:15.000000000 +0100
+@@ -0,0 +1,1278 @@
</ins><span class="cx"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
</span><span class="cx"> + "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
</span><span class="cx"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
</span><span class="cx"> +<head>
</span><span class="cx"> +<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
</span><del>-+<meta name="generator" content="AsciiDoc 8.6.8" />
</del><ins>++<meta name="generator" content="AsciiDoc 8.6.9" />
</ins><span class="cx"> +<title>git-subtree(1)</title>
</span><span class="cx"> +<style type="text/css">
</span><span class="cx"> +/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
</span><span class="lines">@@ -97,8 +98,10 @@
</span><span class="cx"> + padding: 0;
</span><span class="cx"> + margin: 0;
</span><span class="cx"> +}
</span><ins>++pre {
++ white-space: pre-wrap;
++}
</ins><span class="cx"> +
</span><del>-+
</del><span class="cx"> +#author {
</span><span class="cx"> + color: #527bbd;
</span><span class="cx"> + font-weight: bold;
</span><span class="lines">@@ -226,7 +229,7 @@
</span><span class="cx"> +}
</span><span class="cx"> +
</span><span class="cx"> +div.imageblock div.content { padding-left: 0; }
</span><del>-+span.image img { border-style: none; }
</del><ins>++span.image img { border-style: none; vertical-align: text-bottom; }
</ins><span class="cx"> +a.image:visited { color: white; }
</span><span class="cx"> +
</span><span class="cx"> +dl {
</span><span class="lines">@@ -749,10 +752,10 @@
</span><span class="cx"> +<h2 id="_synopsis">SYNOPSIS</h2>
</span><span class="cx"> +<div class="sectionbody">
</span><span class="cx"> +<div class="verseblock">
</span><del>-+<pre class="content"><em>git subtree</em> add -P &lt;prefix&gt; &lt;refspec&gt;
-+<em>git subtree</em> add -P &lt;prefix&gt; &lt;repository&gt; &lt;refspec&gt;
-+<em>git subtree</em> pull -P &lt;prefix&gt; &lt;repository&gt; &lt;refspec&#8230;&gt;
-+<em>git subtree</em> push -P &lt;prefix&gt; &lt;repository&gt; &lt;refspec&#8230;&gt;
</del><ins>++<pre class="content"><em>git subtree</em> add -P &lt;prefix&gt; &lt;commit&gt;
++<em>git subtree</em> add -P &lt;prefix&gt; &lt;repository&gt; &lt;ref&gt;
++<em>git subtree</em> pull -P &lt;prefix&gt; &lt;repository&gt; &lt;ref&gt;
++<em>git subtree</em> push -P &lt;prefix&gt; &lt;repository&gt; &lt;ref&gt;
</ins><span class="cx"> +<em>git subtree</em> merge -P &lt;prefix&gt; &lt;commit&gt;
</span><span class="cx"> +<em>git subtree</em> split -P &lt;prefix&gt; [OPTIONS] [&lt;commit&gt;]</pre>
</span><span class="cx"> +<div class="attribution">
</span><span class="lines">@@ -818,7 +821,7 @@
</span><span class="cx"> +<dd>
</span><span class="cx"> +<p>
</span><span class="cx"> + Create the &lt;prefix&gt; subtree by importing its contents
</span><del>-+ from the given &lt;refspec&gt; or &lt;repository&gt; and remote &lt;refspec&gt;.
</del><ins>++ from the given &lt;commit&gt; or &lt;repository&gt; and remote &lt;ref&gt;.
</ins><span class="cx"> + A new commit is created automatically, joining the imported
</span><span class="cx"> + project&#8217;s history with your own. With <em>--squash</em>, imports
</span><span class="cx"> + only a single commit from the subproject, rather than its
</span><span class="lines">@@ -852,7 +855,7 @@
</span><span class="cx"> +<dd>
</span><span class="cx"> +<p>
</span><span class="cx"> + Exactly like <em>merge</em>, but parallels <em>git pull</em> in that
</span><del>-+ it fetches the given commit from the specified remote
</del><ins>++ it fetches the given ref from the specified remote
</ins><span class="cx"> + repository.
</span><span class="cx"> +</p>
</span><span class="cx"> +</dd>
</span><span class="lines">@@ -863,7 +866,7 @@
</span><span class="cx"> +<p>
</span><span class="cx"> + Does a <em>split</em> (see below) using the &lt;prefix&gt; supplied
</span><span class="cx"> + and then does a <em>git push</em> to push the result to the
</span><del>-+ repository and refspec. This can be used to push your
</del><ins>++ repository and ref. This can be used to push your
</ins><span class="cx"> + subtree to different branches of the remote repository.
</span><span class="cx"> +</p>
</span><span class="cx"> +</dd>
</span><span class="lines">@@ -1154,7 +1157,7 @@
</span><span class="cx"> +<div class="paragraph"><p><em>master</em> needs to be a valid remote ref and can be a different branch
</span><span class="cx"> +name</p></div>
</span><span class="cx"> +<div class="paragraph"><p>You can omit the --squash flag, but doing so will increase the number
</span><del>-+of commits that are incldued in your local repository.</p></div>
</del><ins>++of commits that are included in your local repository.</p></div>
</ins><span class="cx"> +<div class="paragraph"><p>We now have a ~/git-extensions/git-subtree directory containing code
</span><span class="cx"> +from the master branch of git://github.com/apenwarr/git-subtree.git
</span><span class="cx"> +in our git-extensions repository.</p></div>
</span><span class="lines">@@ -1272,7 +1275,7 @@
</span><span class="cx"> +<div id="footnotes"><hr /></div>
</span><span class="cx"> +<div id="footer">
</span><span class="cx"> +<div id="footer-text">
</span><del>-+Last updated 2013-10-21 10:37:10 PDT
</del><ins>++Last updated 2014-02-14 22:57:09 CET
</ins><span class="cx"> +</div>
</span><span class="cx"> +</div>
</span><span class="cx"> +</body>
</span></span></pre>
</div>
</div>
</body>
</html>