<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/6715ace87fe47821b4a5e6568dec58bca39a3ac7">https://github.com/macports/macports-ports/commit/6715ace87fe47821b4a5e6568dec58bca39a3ac7</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 6715ace  git: update to 2.12.0, remove integrated patch
</span>6715ace is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 6715ace87fe47821b4a5e6568dec58bca39a3ac7
</span>Author: Zero King <l2dy@icloud.com>
AuthorDate: Sun Feb 26 09:20:13 2017 +0000

<span style='display:block; white-space:pre;color:#404040;'>    git: update to 2.12.0, remove integrated patch
</span>---
 devel/git/Portfile                    | 18 ++++++------
 devel/git/files/git-subtree.1.diff    |  6 ++--
 devel/git/files/git-subtree.html.diff |  8 +++---
 devel/git/files/gitk-color-lime.diff  | 53 -----------------------------------
 4 files changed, 16 insertions(+), 69 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 7a418fa..33dfbd3 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;'>@@ -4,7 +4,7 @@ PortSystem          1.0
</span> PortGroup           perl5 1.0
 
 name                git
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             2.11.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             2.12.0
</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,14 +22,14 @@ 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  b0250e6c09ee4aa5516bab2b355854c20673ebdc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  c0a779cae325d48a1d5ba08b6ee1febcc31d0657a6da01fd1dec1c6e10976415 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  8ae8a4dc51973d4ad154ce0f08b23122601b9db9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  1821766479062d052cc1897d0ded95212e81e5c7f1039786bc4aec2225a32027 \
</span>                     git-manpages-${version}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  a454ebedf160dab26cf00040bcd046e568455d73 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  69486ed339ee0591001ae83d43c888aa26351b9680b6ceb59e06b593051bca31
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  be51d43d5295a49841930803dbe7609a6596849f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  8b8356f8d50eff6499c5d05e87c106a7b1b48bd16de1742fa022631909804773
</span> 
 perl5.require_variant   yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-perl5.conflict_variants yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.conflict_variants no
</span> perl5.branches          5.24
 perl5.create_variants   ${perl5.branches}
 perl5.default_branch    5.24
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,7 @@ depends_run-append  port:p${perl5.major}-authen-sasl \
</span>                     port:p${perl5.major}-cgi \
                     port:rsync
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          patch-Makefile.diff git-subtree.1.diff gitk-color-lime.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-Makefile.diff git-subtree.1.diff
</span> patch.pre_args      -p1
 
 extract.only        git-${version}${extract.suffix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,8 +142,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  262a1b4bbac016853c3c21db07e4550b9baa8361 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            sha256  1a5f1e4a5eadad89b0783efa08bb1f7e3802d4a4d0a135bf5f61fd672ea3846e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            rmd160  735bebf67681f7c46a25213dac367209c0bb5268 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            sha256  bd548faa2c9e63403e528ce4f4e87561e78949a0349a9e2a27e0d6e581d3a8bd
</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 da072bc..fbcaca2 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;'>@@ -5,12 +5,12 @@
</span> +.\"     Title: git-subtree
 +.\"    Author: [see the "AUTHOR" section]
 +.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+.\"      Date: 10/30/2016
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.\"      Date: 03/02/2017
</span> +.\"    Manual: Git Manual
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+.\"    Source: Git 2.10.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.\"    Source: Git 2.12.0
</span> +.\"  Language: English
 +.\"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+.TH "GIT\-SUBTREE" "1" "10/30/2016" "Git 2\&.10\&.2" "Git Manual"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.TH "GIT\-SUBTREE" "1" "03/02/2017" "Git 2\&.12\&.0" "Git Manual"
</span> +.\" -----------------------------------------------------------------
 +.\" * Define some portability stuff
 +.\" -----------------------------------------------------------------
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git/files/git-subtree.html.diff b/devel/git/files/git-subtree.html.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 366a03d..348d3ef 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git/files/git-subtree.html.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/git/files/git-subtree.html.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/contrib/subtree/git-subtree.html     1970-01-01 01:00:00.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/contrib/subtree/git-subtree.html     2015-02-06 11:49:43.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.html
</span> @@ -0,0 +1,1205 @@
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
 +    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -955,7 +955,7 @@
</span> +</dt>
 +<dd>
 +<p>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+        This option is only valid for add, merge, push and pull
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        This option is only valid for add, merge, and pull
</span> +        commands.
 +</p>
 +<div class="paragraph"><p>Instead of merging the entire history from the subtree project, produce
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1201,7 +1201,7 @@
</span> +<div id="footnotes"><hr /></div>
 +<div id="footer">
 +<div id="footer-text">
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+Last updated 2015-02-05 22:40:08 CET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Last updated 2017-02-24 19:17:39 UTC
</span> +</div>
 +</div>
 +</body>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git/files/gitk-color-lime.diff b/devel/git/files/gitk-color-lime.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a31cdfa..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git/files/gitk-color-lime.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,53 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/gitk-git/gitk.orig   2016-01-21 18:18:32.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/gitk-git/gitk        2016-01-21 18:24:22.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2265,7 +2265,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   set h [expr {[font metrics uifont -linespace] + 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   set progresscanv .tf.bar.progress
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   canvas $progresscanv -relief sunken -height $h -borderwidth 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  set progressitem [$progresscanv create rect -1 0 0 $h -fill lime]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  set progressitem [$progresscanv create rect -1 0 0 $h -fill "#00FF00"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   set fprogitem [$progresscanv create rect -1 0 0 $h -fill yellow]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   set rprogitem [$progresscanv create rect -1 0 0 $h -fill red]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3397,7 +3397,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        0x00, 0x00, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--image create bitmap reficon-H -background black -foreground lime \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+image create bitmap reficon-H -background black -foreground "#00FF00" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     -data $rectdata -maskdata $rectmask
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- image create bitmap reficon-o -background black -foreground "#ddddff" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     -data $rectdata -maskdata $rectmask
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12188,7 +12188,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     set extdifftool "meld"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set colors {lime red blue magenta darkgrey brown orange}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set colors {"#00FF00" red blue magenta darkgrey brown orange}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[tk windowingsystem] eq "win32"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     set uicolor SystemButtonFace
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     set uifgcolor SystemButtonText
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12206,12 +12206,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set diffcolors {red "#00a000" blue}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set diffcontext 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set mergecolors {red blue lime purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set mergecolors {red blue "#00FF00" purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ignorespace 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set worddiff ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set markbgcolor "#e0e0ff"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set headbgcolor lime
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set headbgcolor "#00FF00"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set headfgcolor black
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set headoutlinecolor black
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set remotebgcolor #ffddaa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12226,7 +12226,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set linehoveroutlinecolor black
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mainheadcirclecolor yellow
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set workingfilescirclecolor red
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set indexcirclecolor lime
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set indexcirclecolor "#00FF00"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set circlecolors {white blue gray blue blue}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set linkfgcolor blue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set circleoutlinecolor $fgcolor
</span></pre><pre style='margin:0'>

</pre>