<pre style='margin:0'>
ci42 pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3e8a5bb84e9b2ce30f12e9f04167e962f8732dcc">https://github.com/macports/macports-ports/commit/3e8a5bb84e9b2ce30f12e9f04167e962f8732dcc</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 3e8a5bb git: update to 2.10.2.
</span>3e8a5bb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3e8a5bb84e9b2ce30f12e9f04167e962f8732dcc
</span>Author: Ivan Larionov <xeron.oskom@gmail.com>
AuthorDate: Fri Nov 4 22:11:44 2016 -0700
<span style='display:block; white-space:pre;color:#404040;'> git: update to 2.10.2.
</span>---
devel/git/Portfile | 15 +++++++--------
devel/git/files/git-subtree.1.diff | 20 ++++++++++----------
2 files changed, 17 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git/Portfile b/devel/git/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4bbcd5c..e4f6069 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/git/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span>
PortSystem 1.0
PortGroup perl5 1.0
name git
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.10.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.10.2
</span>
description A fast version control system
long_description Git is a fast, scalable, distributed open source version \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,11 +21,11 @@ distfiles git-${version}${extract.suffix} \
</span> git-manpages-${version}${extract.suffix}
checksums git-${version}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 d935710c8e98405cb1da0dbaca02b087c7bdfc48 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 78553f786f1a66cb68983c170be482558028a3376056c0f2ed366f331b1e35f2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 5cd6dfc528ed9a9c688d03253cb5beca8383e759 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3d7ef275d80b97aaa61f3b6be9d3dc516202e6f6f5d885f2c09b59eba592dcc4 \
</span> git-manpages-${version}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 b7e5523697962cad700d8312e0ddcb0948f163bf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4572477a8ffa69963f2be7d6e0fe63b8192de2c301edf3e37a888f904bbfd12e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 2e104e93f541b55a9193a8e2b5dd4be05ce309d4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1eab53833fbb432e9c936dd46a5beb6d25d2fae8be258def503b1c21a7bf5363
</span>
perl5.require_variant yes
perl5.conflict_variants yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,8 +140,8 @@ variant pcre {
</span> variant doc description {Install HTML and plaintext documentation} {
distfiles-append git-htmldocs-${version}${extract.suffix}
checksums-append git-htmldocs-${version}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f7bd4fb1c5c90ea5dad678b0da15a7f18898f06c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cb36e94cfdfb00d8e763ea46baa59c6d9c7ef5143b9bfb37e35b25b144f10faa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 1c3747c6a2df8316eccab38e62ecbc9392890fe2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 47d972fdee409dfd30c4f323bf547317f7d471e777f0c8e51b667735b8780e93
</span>
patchfiles-append git-subtree.html.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git/files/git-subtree.1.diff b/devel/git/files/git-subtree.1.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c5ca3c6..da072bc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git/files/git-subtree.1.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/git/files/git-subtree.1.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/contrib/subtree/git-subtree.1 1970-01-01 01:00:00.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/contrib/subtree/git-subtree.1 2015-02-06 11:49:34.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/contrib/subtree/git-subtree.1
</span> @@ -0,0 +1,410 @@
+'\" t
+.\" Title: git-subtree
+.\" Author: [see the "AUTHOR" section]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.\" Date: 03/03/2016
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.\" Date: 10/30/2016
</span> +.\" Manual: Git Manual
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+.\" Source: Git 2.10.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.\" Source: Git 2.10.2
</span> +.\" Language: English
+.\"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+.TH "GIT\-SUBTREE" "1" "03/03/2016" "Git 2\&.10\&.0" "Git Manual"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.TH "GIT\-SUBTREE" "1" "10/30/2016" "Git 2\&.10\&.2" "Git Manual"
</span> +.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,7 +145,7 @@
</span> +.PP
+\-\-squash
+.RS 4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+This option is only valid for add, merge and pull commands\&.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++This option is only valid for add, merge, and pull commands\&.
</span> +.sp
+Instead of merging the entire history from the subtree project, produce only a single commit that contains all the differences you want to merge, and then merge that new commit into your project\&.
+.sp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -219,7 +219,7 @@
</span> +\fI\-\-rejoin\fR
+when you split, because you don\(cqt want the subproject\(cqs history to be part of your project anyway\&.
+.RE
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+.SH "EXAMPLE 1. ADD COMMAND"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.SH "EXAMPLE 1\&. ADD COMMAND"
</span> +.sp
+Let\(cqs assume that you have a local repository that you would like to add an external vendor library to\&. In this case we will add the git\-subtree repository as a subdirectory of your already existing git\-extensions repository in ~/git\-extensions/:
+.sp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -239,7 +239,7 @@
</span> +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\&.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+.SH "EXAMPLE 2. EXTRACT A SUBTREE USING COMMIT, MERGE AND PULL"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.SH "EXAMPLE 2\&. EXTRACT A SUBTREE USING COMMIT, MERGE AND PULL"
</span> +.sp
+Let\(cqs use the repository for the git source code as an example\&. First, get your own copy of the git\&.git repository:
+.sp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -359,7 +359,7 @@
</span> +.if n \{\
+.RE
+.\}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+.SH "EXAMPLE 3. EXTRACT A SUBTREE USING BRANCH"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.SH "EXAMPLE 3\&. EXTRACT A SUBTREE USING BRANCH"
</span> +.sp
+Suppose you have a source directory with many files and subdirectories, and you want to extract the lib directory to its own git project\&. Here\(cqs a short way to do it:
+.sp
</pre><pre style='margin:0'>
</pre>