[117972] trunk/dports/devel/git-core
ciserlohn at macports.org
ciserlohn at macports.org
Mon Mar 17 14:19:06 PDT 2014
Revision: 117972
https://trac.macports.org/changeset/117972
Author: ciserlohn at macports.org
Date: 2014-03-17 14:19:06 -0700 (Mon, 17 Mar 2014)
Log Message:
-----------
git-core: update to version 1.9.0
Modified Paths:
--------------
trunk/dports/devel/git-core/Portfile
trunk/dports/devel/git-core/files/git-subtree.1.diff
trunk/dports/devel/git-core/files/git-subtree.html.diff
Modified: trunk/dports/devel/git-core/Portfile
===================================================================
--- 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)
@@ -4,7 +4,7 @@
PortSystem 1.0
name git-core
-version 1.8.5.5
+version 1.9.0
description A fast version control system
long_description Git is a fast, scalable, distributed open source version \
control system focusing on speed and efficiency.
@@ -19,11 +19,11 @@
git-manpages-${version}${extract.suffix}
checksums git-${version}${extract.suffix} \
- rmd160 46becd9525b669bea82b04df2003cfe059732bd9 \
- sha256 8524db697dbc2bad256fcfe6df1b2af67009c1438523cc82566311b0c7bf11da \
+ rmd160 bc8d4046749bf256494d6fc8f3a92e9c4d57aba6 \
+ sha256 de3097fdc36d624ea6cf4bb853402fde781acdb860f12152c5eb879777389882 \
git-manpages-${version}${extract.suffix} \
- rmd160 559af70cae635b52ed1c5d144e0afad13287a4a4 \
- sha256 b3673f1b0f35150c2a8a58c59d568c8560a896bc4c74154240a5a2ef69594d04 \
+ rmd160 4cbdcc81d196b0ac9e79fe5bc5b98f85bddb39d0 \
+ sha256 a51e2b64a8adde39e774f052843e0f513b5d3318492b515e752e339b0d3a85c7 \
depends_run port:rsync
@@ -157,8 +157,8 @@
variant doc description {Install HTML and plaintext documentation} {
distfiles-append git-htmldocs-${version}${extract.suffix}
checksums-append git-htmldocs-${version}${extract.suffix} \
- rmd160 4617e63299477bf6a7b5791faca789300d0d3828 \
- sha256 3ff3b0b89834d20c0ecdf54d772dbab0f9a4871c4e8e7bff3021e27f74fb6d40
+ rmd160 23503762371c8f4605eb68f4a7485f80ca440d76 \
+ sha256 e4e619b7dd5b24ab4ef17e598803497704aa5b0a7821bb544940f2cdd7cac60e
patchfiles-append git-subtree.html.diff
Modified: trunk/dports/devel/git-core/files/git-subtree.1.diff
===================================================================
--- 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)
@@ -1,16 +1,17 @@
+diff -urN a/contrib/subtree/git-subtree.1 b/contrib/subtree/git-subtree.1
--- a/contrib/subtree/git-subtree.1 1970-01-01 01:00:00.000000000 +0100
-+++ b/contrib/subtree/git-subtree.1 2013-05-11 15:29:35.000000000 +0200
-@@ -0,0 +1,607 @@
++++ b/contrib/subtree/git-subtree.1 2014-03-17 22:04:30.000000000 +0100
+@@ -0,0 +1,606 @@
+'\" t
+.\" Title: git-subtree
+.\" Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-+.\" Date: 02/21/2014
++.\" Date: 03/17/2014
+.\" Manual: Git Manual
-+.\" Source: Git 1.8.5.5
++.\" Source: Git 1.9.0
+.\" Language: English
+.\"
-+.TH "GIT\-SUBTREE" "1" "02/21/2014" "Git 1\&.8\&.5\&.5" "Git Manual"
++.TH "GIT\-SUBTREE" "1" "03/17/2014" "Git 1\&.9\&.0" "Git Manual"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
@@ -35,14 +36,13 @@
+.SH "SYNOPSIS"
+.sp
+.nf
-+\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\&...>
++\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>
+\fIgit subtree\fR merge \-P <prefix> <commit>
+\fIgit subtree\fR split \-P <prefix> [OPTIONS] [<commit>]
+.fi
-+.sp
+.SH "DESCRIPTION"
+.sp
+Subtrees allow subprojects to be included within a subdirectory of the main project, optionally including the subproject\(cqs entire history\&.
@@ -74,7 +74,7 @@
+.PP
+add
+.RS 4
-+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
++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
+\fI\-\-squash\fR, imports only a single commit from the subproject, rather than its entire history\&.
+.RE
+.PP
@@ -104,7 +104,7 @@
+Exactly like
+\fImerge\fR, but parallels
+\fIgit pull\fR
-+in that it fetches the given commit from the specified remote repository\&.
++in that it fetches the given ref from the specified remote repository\&.
+.RE
+.PP
+push
@@ -113,7 +113,7 @@
+\fIsplit\fR
+(see below) using the <prefix> supplied and then does a
+\fIgit push\fR
-+to push the result to the repository and refspec\&. This can be used to push your subtree to different branches of the remote repository\&.
++to push the result to the repository and ref\&. This can be used to push your subtree to different branches of the remote repository\&.
+.RE
+.PP
+split
@@ -433,7 +433,7 @@
+.sp
+\fImaster\fR needs to be a valid remote ref and can be a different branch name
+.sp
-+You can omit the \-\-squash flag, but doing so will increase the number of commits that are incldued in your local repository\&.
++You can omit the \-\-squash flag, but doing so will increase the number of commits that are included in your local repository\&.
+.sp
+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\&.
+.SH "EXAMPLE 2. EXTRACT A SUBTREE USING COMMIT, MERGE AND PULL"
Modified: trunk/dports/devel/git-core/files/git-subtree.html.diff
===================================================================
--- 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)
@@ -1,12 +1,13 @@
+diff -urN a/contrib/subtree/git-subtree.html b/contrib/subtree/git-subtree.html
--- a/contrib/subtree/git-subtree.html 1970-01-01 01:00:00.000000000 +0100
-+++ b/contrib/subtree/git-subtree.html 2013-05-11 15:24:13.000000000 +0200
-@@ -0,0 +1,1276 @@
++++ b/contrib/subtree/git-subtree.html 2014-03-17 22:03:15.000000000 +0100
+@@ -0,0 +1,1278 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-+<meta name="generator" content="AsciiDoc 8.6.8" />
++<meta name="generator" content="AsciiDoc 8.6.9" />
+<title>git-subtree(1)</title>
+<style type="text/css">
+/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -97,8 +98,10 @@
+ padding: 0;
+ margin: 0;
+}
++pre {
++ white-space: pre-wrap;
++}
+
-+
+#author {
+ color: #527bbd;
+ font-weight: bold;
@@ -226,7 +229,7 @@
+}
+
+div.imageblock div.content { padding-left: 0; }
-+span.image img { border-style: none; }
++span.image img { border-style: none; vertical-align: text-bottom; }
+a.image:visited { color: white; }
+
+dl {
@@ -749,10 +752,10 @@
+<h2 id="_synopsis">SYNOPSIS</h2>
+<div class="sectionbody">
+<div class="verseblock">
-+<pre class="content"><em>git subtree</em> add -P <prefix> <refspec>
-+<em>git subtree</em> add -P <prefix> <repository> <refspec>
-+<em>git subtree</em> pull -P <prefix> <repository> <refspec…>
-+<em>git subtree</em> push -P <prefix> <repository> <refspec…>
++<pre class="content"><em>git subtree</em> add -P <prefix> <commit>
++<em>git subtree</em> add -P <prefix> <repository> <ref>
++<em>git subtree</em> pull -P <prefix> <repository> <ref>
++<em>git subtree</em> push -P <prefix> <repository> <ref>
+<em>git subtree</em> merge -P <prefix> <commit>
+<em>git subtree</em> split -P <prefix> [OPTIONS] [<commit>]</pre>
+<div class="attribution">
@@ -818,7 +821,7 @@
+<dd>
+<p>
+ Create the <prefix> subtree by importing its contents
-+ from the given <refspec> or <repository> and remote <refspec>.
++ from the given <commit> or <repository> and remote <ref>.
+ A new commit is created automatically, joining the imported
+ project’s history with your own. With <em>--squash</em>, imports
+ only a single commit from the subproject, rather than its
@@ -852,7 +855,7 @@
+<dd>
+<p>
+ Exactly like <em>merge</em>, but parallels <em>git pull</em> in that
-+ it fetches the given commit from the specified remote
++ it fetches the given ref from the specified remote
+ repository.
+</p>
+</dd>
@@ -863,7 +866,7 @@
+<p>
+ Does a <em>split</em> (see below) using the <prefix> supplied
+ and then does a <em>git push</em> to push the result to the
-+ repository and refspec. This can be used to push your
++ repository and ref. This can be used to push your
+ subtree to different branches of the remote repository.
+</p>
+</dd>
@@ -1154,7 +1157,7 @@
+<div class="paragraph"><p><em>master</em> needs to be a valid remote ref and can be a different branch
+name</p></div>
+<div class="paragraph"><p>You can omit the --squash flag, but doing so will increase the number
-+of commits that are incldued in your local repository.</p></div>
++of commits that are included in your local repository.</p></div>
+<div class="paragraph"><p>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.</p></div>
@@ -1272,7 +1275,7 @@
+<div id="footnotes"><hr /></div>
+<div id="footer">
+<div id="footer-text">
-+Last updated 2013-10-21 10:37:10 PDT
++Last updated 2014-02-14 22:57:09 CET
+</div>
+</div>
+</body>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140317/539102d4/attachment-0001.html>
More information about the macports-changes
mailing list