[132649] trunk/dports/devel/git

ciserlohn at macports.org ciserlohn at macports.org
Fri Feb 6 06:25:00 PST 2015 

Revision: 132649
          https://trac.macports.org/changeset/132649
Author:   ciserlohn at macports.org
Date:     2015-02-06 06:25:00 -0800 (Fri, 06 Feb 2015)
Log Message:
-----------
git: update to version 2.3.0; fix file permission

Modified Paths:
--------------
    trunk/dports/devel/git/Portfile
    trunk/dports/devel/git/files/git-subtree.1.diff
    trunk/dports/devel/git/files/git-subtree.html.diff

Modified: trunk/dports/devel/git/Portfile
===================================================================
--- trunk/dports/devel/git/Portfile	2015-02-06 14:23:18 UTC (rev 132648)
+++ trunk/dports/devel/git/Portfile	2015-02-06 14:25:00 UTC (rev 132649)
@@ -5,7 +5,7 @@
 PortGroup           perl5 1.0
 
 name                git
-version             2.2.2
+version             2.3.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.
@@ -20,11 +20,11 @@
                     git-manpages-${version}${extract.suffix}
 
 checksums           git-${version}${extract.suffix} \
-                    rmd160  f6195474155bb7be179f4781229e16f1adffe759 \
-                    sha256  e9e50d0d382183a9327d39334eb65db92852208e1438aab2a9bf8d06ef17b653 \
+                    rmd160  56e8947db326a6269eb54e1289b0a92eda5b5e09 \
+                    sha256  ba2fe814e709a5d0f034ebe82083fce7feed0899b3a8c8b3adf1c5a85d1ce9ac \
                     git-manpages-${version}${extract.suffix} \
-                    rmd160  fa2b2923a052c39bea1be91e47ed05d984199740 \
-                    sha256  c9340fad1f521f3782abca4839d66bfee237f3e931856413561cf1b55fc9d550 \
+                    rmd160  c6fb108a3af0b6a4bbd51507fa8b2ab7e7c2f187 \
+                    sha256  8aa4d1e5d7bbf5641a9de92279369d9b20cc266ba7b2888104efa40e80b53559 \
 
 perl5.require_variant   yes
 perl5.conflict_variants yes
@@ -95,8 +95,9 @@
     if {![variant_isset svn]} {
         system "rm ${destroot}${prefix}/libexec/git-core/git-svn*"
     }
+
     xinstall -d ${docdestroot}
-
+    
     fs-traverse badfile ${destroot} {
         if {[string last perllocal.pod ${badfile}] != -1} {
             ui_info "Removing ${badfile}"
@@ -148,8 +149,8 @@
 variant doc description {Install HTML and plaintext documentation} {
     distfiles-append        git-htmldocs-${version}${extract.suffix}
     checksums-append        git-htmldocs-${version}${extract.suffix} \
-                            rmd160  1d78b0e7dc9649ac2888c87fecf301ffd0dafb31 \
-                            sha256  7f5eb11cf3dd5abb4705fb91f52c78ff4265b2e2eb15948cef311b3e04896d1c
+                            rmd160  2b7c5ba8761d920bcf89f11276a99374caafbd81 \
+                            sha256  f8edf1547d3fd4e7e820dd2fad1b92eaae6335c993c26e4b03989ea3941d8441
 
     patchfiles-append       git-subtree.html.diff
 
@@ -170,6 +171,10 @@
             file attribute ${f} -permissions ugo+r
             copy ${f} ${docdestroot}
         }
+
+        fs-traverse f [list ${docdestroot}/howto ${docdestroot}/technical ${docdestroot}/RelNotes] {
+            file attribute ${f} -permissions ugo+r
+        }
     }
 }
 

Modified: trunk/dports/devel/git/files/git-subtree.1.diff
===================================================================
--- trunk/dports/devel/git/files/git-subtree.1.diff	2015-02-06 14:23:18 UTC (rev 132648)
+++ trunk/dports/devel/git/files/git-subtree.1.diff	2015-02-06 14:25:00 UTC (rev 132649)
@@ -1,17 +1,16 @@
-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	2014-03-17 22:04:30.000000000 +0100
-@@ -0,0 +1,606 @@
++++ b/contrib/subtree/git-subtree.1	2015-02-06 11:49:34.000000000 +0100
+@@ -0,0 +1,410 @@
 +'\" t
 +.\"     Title: git-subtree
 +.\"    Author: [see the "AUTHOR" section]
 +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-+.\"      Date: 08/19/2014
++.\"      Date: 02/06/2015
 +.\"    Manual: Git Manual
-+.\"    Source: Git 2.2.2
++.\"    Source: Git 2.3.0
 +.\"  Language: English
 +.\"
-+.TH "GIT\-SUBTREE" "1" "08/19/2014" "Git 2\&.2\&.2" "Git Manual"
++.TH "GIT\-SUBTREE" "1" "02/06/2015" "Git 2\&.3\&.0" "Git Manual"
 +.\" -----------------------------------------------------------------
 +.\" * Define some portability stuff
 +.\" -----------------------------------------------------------------
@@ -84,20 +83,9 @@
 +\fIgit merge\fR, this doesn\(cqt remove your own local changes; it just merges those changes into the latest <commit>\&. With
 +\fI\-\-squash\fR, creates only one commit that contains all the changes, rather than merging in the entire history\&.
 +.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+If you use \*(Aq\-\-squash\*(Aq, the merge direction doesn\*(Aqt
-+always have to be forward; you can use this command to
-+go back in time from v2\&.5 to v2\&.4, for example\&.  If your
-+merge introduces a conflict, you can resolve it in the
-+usual ways\&.
-+.fi
-+.if n \{\
++If you use
++\fI\-\-squash\fR, the merge direction doesn\(cqt always have to be forward; you can use this command to go back in time from v2\&.5 to v2\&.4, for example\&. If your merge introduces a conflict, you can resolve it in the usual ways\&.
 +.RE
-+.\}
-+.RE
 +.PP
 +pull
 +.RS 4
@@ -120,45 +108,18 @@
 +.RS 4
 +Extract a new, synthetic project history from the history of the <prefix> subtree\&. The new history includes only the commits (including merges) that affected <prefix>, and each of those commits now has the contents of <prefix> at the root of the project instead of in a subdirectory\&. Thus, the newly created history is suitable for export as a separate git repository\&.
 +.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+After splitting successfully, a single commit id is
-+printed to stdout\&.  This corresponds to the HEAD of the
-+newly created tree, which you can manipulate however you
-+want\&.
-+.fi
-+.if n \{\
-+.RE
-+.\}
++After splitting successfully, a single commit id is printed to stdout\&. This corresponds to the HEAD of the newly created tree, which you can manipulate however you want\&.
 +.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+Repeated splits of exactly the same history are
-+guaranteed to be identical (ie\&. to produce the same
-+commit ids)\&.  Because of this, if you add new commits
-+and then re\-split, the new commits will be attached as
-+commits on top of the history you generated last time,
-+so \*(Aqgit merge\*(Aq and friends will work as expected\&.
-+.fi
-+.if n \{\
-+.RE
-+.\}
++Repeated splits of exactly the same history are guaranteed to be identical (i\&.e\&. to produce the same commit ids)\&. Because of this, if you add new commits and then re\-split, the new commits will be attached as commits on top of the history you generated last time, so
++\fIgit merge\fR
++and friends will work as expected\&.
 +.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+Note that if you use \*(Aq\-\-squash\*(Aq when you merge, you
-+should usually not just \*(Aq\-\-rejoin\*(Aq when you split\&.
-+.fi
-+.if n \{\
++Note that if you use
++\fI\-\-squash\fR
++when you merge, you should usually not just
++\fI\-\-rejoin\fR
++when you split\&.
 +.RE
-+.\}
-+.RE
 +.SH "OPTIONS"
 +.PP
 +\-q, \-\-quiet
@@ -186,236 +147,78 @@
 +.RS 4
 +This option is only valid for add, merge, push and pull commands\&.
 +.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+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\&.
-+.fi
-+.if n \{\
-+.RE
-+.\}
++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
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+Using this option helps to reduce log clutter\&. People
-+rarely want to see every change that happened between
-+v1\&.0 and v1\&.1 of the library they\*(Aqre using, since none of the
-+interim versions were ever included in their application\&.
-+.fi
-+.if n \{\
-+.RE
-+.\}
++Using this option helps to reduce log clutter\&. People rarely want to see every change that happened between v1\&.0 and v1\&.1 of the library they\(cqre using, since none of the interim versions were ever included in their application\&.
 +.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+Using \*(Aq\-\-squash\*(Aq also helps avoid problems when the same
-+subproject is included multiple times in the same
-+project, or is removed and then re\-added\&.  In such a
-+case, it doesn\*(Aqt make sense to combine the histories
-+anyway, since it\*(Aqs unclear which part of the history
-+belongs to which subtree\&.
-+.fi
-+.if n \{\
-+.RE
-+.\}
++Using
++\fI\-\-squash\fR
++also helps avoid problems when the same subproject is included multiple times in the same project, or is removed and then re\-added\&. In such a case, it doesn\(cqt make sense to combine the histories anyway, since it\(cqs unclear which part of the history belongs to which subtree\&.
 +.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+Furthermore, with \*(Aq\-\-squash\*(Aq, you can switch back and
-+forth between different versions of a subtree, rather
-+than strictly forward\&.  \*(Aqgit subtree merge \-\-squash\*(Aq
-+always adjusts the subtree to match the exactly
-+specified commit, even if getting to that commit would
-+require undoing some changes that were added earlier\&.
-+.fi
-+.if n \{\
-+.RE
-+.\}
++Furthermore, with
++\fI\-\-squash\fR, you can switch back and forth between different versions of a subtree, rather than strictly forward\&.
++\fIgit subtree merge \-\-squash\fR
++always adjusts the subtree to match the exactly specified commit, even if getting to that commit would require undoing some changes that were added earlier\&.
 +.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+Whether or not you use \*(Aq\-\-squash\*(Aq, changes made in your
-+local repository remain intact and can be later split
-+and send upstream to the subproject\&.
-+.fi
-+.if n \{\
++Whether or not you use
++\fI\-\-squash\fR, changes made in your local repository remain intact and can be later split and send upstream to the subproject\&.
 +.RE
-+.\}
-+.RE
 +.SH "OPTIONS FOR SPLIT"
 +.PP
 +\-\-annotate=<annotation>
 +.RS 4
 +This option is only valid for the split command\&.
 +.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+When generating synthetic history, add <annotation> as a
-+prefix to each commit message\&.  Since we\*(Aqre creating new
-+commits with the same commit message, but possibly
-+different content, from the original commits, this can help
-+to differentiate them and avoid confusion\&.
-+.fi
-+.if n \{\
-+.RE
-+.\}
++When generating synthetic history, add <annotation> as a prefix to each commit message\&. Since we\(cqre creating new commits with the same commit message, but possibly different content, from the original commits, this can help to differentiate them and avoid confusion\&.
 +.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+Whenever you split, you need to use the same
-+<annotation>, or else you don\*(Aqt have a guarantee that
-+the new re\-created history will be identical to the old
-+one\&.  That will prevent merging from working correctly\&.
-+git subtree tries to make it work anyway, particularly
-+if you use \-\-rejoin, but it may not always be effective\&.
-+.fi
-+.if n \{\
++Whenever you split, you need to use the same <annotation>, or else you don\(cqt have a guarantee that the new re\-created history will be identical to the old one\&. That will prevent merging from working correctly\&. git subtree tries to make it work anyway, particularly if you use \-\-rejoin, but it may not always be effective\&.
 +.RE
-+.\}
-+.RE
 +.PP
 +\-b <branch>, \-\-branch=<branch>
 +.RS 4
 +This option is only valid for the split command\&.
 +.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+After generating the synthetic history, create a new
-+branch called <branch> that contains the new history\&.
-+This is suitable for immediate pushing upstream\&.
-+<branch> must not already exist\&.
-+.fi
-+.if n \{\
++After generating the synthetic history, create a new branch called <branch> that contains the new history\&. This is suitable for immediate pushing upstream\&. <branch> must not already exist\&.
 +.RE
-+.\}
-+.RE
 +.PP
 +\-\-ignore\-joins
 +.RS 4
 +This option is only valid for the split command\&.
 +.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+If you use \*(Aq\-\-rejoin\*(Aq, git subtree attempts to optimize
-+its history reconstruction to generate only the new
-+commits since the last \*(Aq\-\-rejoin\*(Aq\&.  \*(Aq\-\-ignore\-join\*(Aq
-+disables this behaviour, forcing it to regenerate the
-+entire history\&.  In a large project, this can take a
-+long time\&.
-+.fi
-+.if n \{\
++If you use
++\fI\-\-rejoin\fR, git subtree attempts to optimize its history reconstruction to generate only the new commits since the last
++\fI\-\-rejoin\fR\&.
++\fI\-\-ignore\-join\fR
++disables this behaviour, forcing it to regenerate the entire history\&. In a large project, this can take a long time\&.
 +.RE
-+.\}
-+.RE
 +.PP
 +\-\-onto=<onto>
 +.RS 4
 +This option is only valid for the split command\&.
 +.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+If your subtree was originally imported using something
-+other than git subtree, its history may not match what
-+git subtree is expecting\&.  In that case, you can specify
-+the commit id <onto> that corresponds to the first
-+revision of the subproject\*(Aqs history that was imported
-+into your project, and git subtree will attempt to build
-+its history from there\&.
-+.fi
-+.if n \{\
-+.RE
-+.\}
++If your subtree was originally imported using something other than git subtree, its history may not match what git subtree is expecting\&. In that case, you can specify the commit id <onto> that corresponds to the first revision of the subproject\(cqs history that was imported into your project, and git subtree will attempt to build its history from there\&.
 +.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+If you used \*(Aqgit subtree add\*(Aq, you should never need
-+this option\&.
-+.fi
-+.if n \{\
++If you used
++\fIgit subtree add\fR, you should never need this option\&.
 +.RE
-+.\}
-+.RE
 +.PP
 +\-\-rejoin
 +.RS 4
 +This option is only valid for the split command\&.
 +.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+After splitting, merge the newly created synthetic
-+history back into your main project\&.  That way, future
-+splits can search only the part of history that has
-+been added since the most recent \-\-rejoin\&.
-+.fi
-+.if n \{\
-+.RE
-+.\}
++After splitting, merge the newly created synthetic history back into your main project\&. That way, future splits can search only the part of history that has been added since the most recent \-\-rejoin\&.
 +.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+If your split commits end up merged into the upstream
-+subproject, and then you want to get the latest upstream
-+version, this will allow git\*(Aqs merge algorithm to more
-+intelligently avoid conflicts (since it knows these
-+synthetic commits are already part of the upstream
-+repository)\&.
-+.fi
-+.if n \{\
-+.RE
-+.\}
++If your split commits end up merged into the upstream subproject, and then you want to get the latest upstream version, this will allow git\(cqs merge algorithm to more intelligently avoid conflicts (since it knows these synthetic commits are already part of the upstream repository)\&.
 +.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+Unfortunately, using this option results in \*(Aqgit log\*(Aq
-+showing an extra copy of every new commit that was
-+created (the original, and the synthetic one)\&.
-+.fi
-+.if n \{\
-+.RE
-+.\}
++Unfortunately, using this option results in
++\fIgit log\fR
++showing an extra copy of every new commit that was created (the original, and the synthetic one)\&.
 +.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+If you do all your merges with \*(Aq\-\-squash\*(Aq, don\*(Aqt use
-+\*(Aq\-\-rejoin\*(Aq when you split, because you don\*(Aqt want the
-+subproject\*(Aqs history to be part of your project anyway\&.
-+.fi
-+.if n \{\
++If you do all your merges with
++\fI\-\-squash\fR, don\(cqt use
++\fI\-\-rejoin\fR
++when you split, because you don\(cqt want the subproject\(cqs history to be part of your project anyway\&.
 +.RE
-+.\}
-+.RE
 +.SH "EXAMPLE 1. ADD COMMAND"
 +.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/:

Modified: trunk/dports/devel/git/files/git-subtree.html.diff
===================================================================
--- trunk/dports/devel/git/files/git-subtree.html.diff	2015-02-06 14:23:18 UTC (rev 132648)
+++ trunk/dports/devel/git/files/git-subtree.html.diff	2015-02-06 14:25:00 UTC (rev 132649)
@@ -1,7 +1,6 @@
-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	2014-03-17 22:03:15.000000000 +0100
-@@ -0,0 +1,1278 @@
++++ b/contrib/subtree/git-subtree.html	2015-02-06 11:49:43.000000000 +0100
+@@ -0,0 +1,1205 @@
 +<!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">
@@ -840,14 +839,10 @@
 +        creates only one commit that contains all the changes,
 +        rather than merging in the entire history.
 +</p>
-+<div class="literalblock">
-+<div class="content">
-+<pre><code>If you use '--squash', the merge direction doesn't
-+always have to be forward; you can use this command to
-+go back in time from v2.5 to v2.4, for example.  If your
-+merge introduces a conflict, you can resolve it in the
-+usual ways.</code></pre>
-+</div></div>
++<div class="paragraph"><p>If you use <em>--squash</em>, the merge direction doesn&#8217;t always have to be
++forward; you can use this command to go back in time from v2.5 to v2.4,
++for example.  If your merge introduces a conflict, you can resolve it in
++the usual ways.</p></div>
 +</dd>
 +<dt class="hdlist1">
 +pull
@@ -883,27 +878,16 @@
 +        of in a subdirectory.  Thus, the newly created history
 +        is suitable for export as a separate git repository.
 +</p>
-+<div class="literalblock">
-+<div class="content">
-+<pre><code>After splitting successfully, a single commit id is
-+printed to stdout.  This corresponds to the HEAD of the
-+newly created tree, which you can manipulate however you
-+want.</code></pre>
-+</div></div>
-+<div class="literalblock">
-+<div class="content">
-+<pre><code>Repeated splits of exactly the same history are
-+guaranteed to be identical (ie. to produce the same
-+commit ids).  Because of this, if you add new commits
-+and then re-split, the new commits will be attached as
-+commits on top of the history you generated last time,
-+so 'git merge' and friends will work as expected.</code></pre>
-+</div></div>
-+<div class="literalblock">
-+<div class="content">
-+<pre><code>Note that if you use '--squash' when you merge, you
-+should usually not just '--rejoin' when you split.</code></pre>
-+</div></div>
++<div class="paragraph"><p>After splitting successfully, a single commit id is printed to stdout.
++This corresponds to the HEAD of the newly created tree, which you can
++manipulate however you want.</p></div>
++<div class="paragraph"><p>Repeated splits of exactly the same history are guaranteed to be
++identical (i.e. to produce the same commit ids).  Because of this, if
++you add new commits and then re-split, the new commits will be attached
++as commits on top of the history you generated last time, so <em>git merge</em>
++and friends will work as expected.</p></div>
++<div class="paragraph"><p>Note that if you use <em>--squash</em> when you merge, you should usually not
++just <em>--rejoin</em> when you split.</p></div>
 +</dd>
 +</dl></div>
 +</div>
@@ -974,44 +958,26 @@
 +        This option is only valid for add, merge, push and pull
 +        commands.
 +</p>
-+<div class="literalblock">
-+<div class="content">
-+<pre><code>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.</code></pre>
-+</div></div>
-+<div class="literalblock">
-+<div class="content">
-+<pre><code>Using this option helps to reduce log clutter. People
-+rarely want to see every change that happened between
-+v1.0 and v1.1 of the library they're using, since none of the
-+interim versions were ever included in their application.</code></pre>
-+</div></div>
-+<div class="literalblock">
-+<div class="content">
-+<pre><code>Using '--squash' also helps avoid problems when the same
-+subproject is included multiple times in the same
-+project, or is removed and then re-added.  In such a
-+case, it doesn't make sense to combine the histories
-+anyway, since it's unclear which part of the history
-+belongs to which subtree.</code></pre>
-+</div></div>
-+<div class="literalblock">
-+<div class="content">
-+<pre><code>Furthermore, with '--squash', you can switch back and
-+forth between different versions of a subtree, rather
-+than strictly forward.  'git subtree merge --squash'
-+always adjusts the subtree to match the exactly
-+specified commit, even if getting to that commit would
-+require undoing some changes that were added earlier.</code></pre>
-+</div></div>
-+<div class="literalblock">
-+<div class="content">
-+<pre><code>Whether or not you use '--squash', changes made in your
-+local repository remain intact and can be later split
-+and send upstream to the subproject.</code></pre>
-+</div></div>
++<div class="paragraph"><p>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.</p></div>
++<div class="paragraph"><p>Using this option helps to reduce log clutter. People rarely want to see
++every change that happened between v1.0 and v1.1 of the library they&#8217;re
++using, since none of the interim versions were ever included in their
++application.</p></div>
++<div class="paragraph"><p>Using <em>--squash</em> also helps avoid problems when the same subproject is
++included multiple times in the same project, or is removed and then
++re-added.  In such a case, it doesn&#8217;t make sense to combine the
++histories anyway, since it&#8217;s unclear which part of the history belongs
++to which subtree.</p></div>
++<div class="paragraph"><p>Furthermore, with <em>--squash</em>, you can switch back and forth between
++different versions of a subtree, rather than strictly forward.  <em>git
++subtree merge --squash</em> always adjusts the subtree to match the exactly
++specified commit, even if getting to that commit would require undoing
++some changes that were added earlier.</p></div>
++<div class="paragraph"><p>Whether or not you use <em>--squash</em>, changes made in your local repository
++remain intact and can be later split and send upstream to the
++subproject.</p></div>
 +</dd>
 +</dl></div>
 +</div>
@@ -1027,23 +993,15 @@
 +<p>
 +        This option is only valid for the split command.
 +</p>
-+<div class="literalblock">
-+<div class="content">
-+<pre><code>When generating synthetic history, add &lt;annotation&gt; as a
-+prefix to each commit message.  Since we're creating new
-+commits with the same commit message, but possibly
-+different content, from the original commits, this can help
-+to differentiate them and avoid confusion.</code></pre>
-+</div></div>
-+<div class="literalblock">
-+<div class="content">
-+<pre><code>Whenever you split, you need to use the same
-+&lt;annotation&gt;, or else you don't have a guarantee that
-+the new re-created history will be identical to the old
-+one.  That will prevent merging from working correctly.
-+git subtree tries to make it work anyway, particularly
-+if you use --rejoin, but it may not always be effective.</code></pre>
-+</div></div>
++<div class="paragraph"><p>When generating synthetic history, add &lt;annotation&gt; as a prefix to each
++commit message.  Since we&#8217;re creating new commits with the same commit
++message, but possibly different content, from the original commits, this
++can help to differentiate them and avoid confusion.</p></div>
++<div class="paragraph"><p>Whenever you split, you need to use the same &lt;annotation&gt;, or else you
++don&#8217;t have a guarantee that the new re-created history will be identical
++to the old one.  That will prevent merging from working correctly.  git
++subtree tries to make it work anyway, particularly if you use --rejoin,
++but it may not always be effective.</p></div>
 +</dd>
 +<dt class="hdlist1">
 +-b &lt;branch&gt;
@@ -1055,13 +1013,9 @@
 +<p>
 +        This option is only valid for the split command.
 +</p>
-+<div class="literalblock">
-+<div class="content">
-+<pre><code>After generating the synthetic history, create a new
-+branch called &lt;branch&gt; that contains the new history.
-+This is suitable for immediate pushing upstream.
-+&lt;branch&gt; must not already exist.</code></pre>
-+</div></div>
++<div class="paragraph"><p>After generating the synthetic history, create a new branch called
++&lt;branch&gt; that contains the new history.  This is suitable for immediate
++pushing upstream.  &lt;branch&gt; must not already exist.</p></div>
 +</dd>
 +<dt class="hdlist1">
 +--ignore-joins
@@ -1070,15 +1024,11 @@
 +<p>
 +        This option is only valid for the split command.
 +</p>
-+<div class="literalblock">
-+<div class="content">
-+<pre><code>If you use '--rejoin', git subtree attempts to optimize
-+its history reconstruction to generate only the new
-+commits since the last '--rejoin'.  '--ignore-join'
-+disables this behaviour, forcing it to regenerate the
-+entire history.  In a large project, this can take a
-+long time.</code></pre>
-+</div></div>
++<div class="paragraph"><p>If you use <em>--rejoin</em>, git subtree attempts to optimize its history
++reconstruction to generate only the new commits since the last
++<em>--rejoin</em>.  <em>--ignore-join</em> disables this behaviour, forcing it to
++regenerate the entire history.  In a large project, this can take a long
++time.</p></div>
 +</dd>
 +<dt class="hdlist1">
 +--onto=&lt;onto&gt;
@@ -1087,21 +1037,12 @@
 +<p>
 +        This option is only valid for the split command.
 +</p>
-+<div class="literalblock">
-+<div class="content">
-+<pre><code>If your subtree was originally imported using something
-+other than git subtree, its history may not match what
-+git subtree is expecting.  In that case, you can specify
-+the commit id &lt;onto&gt; that corresponds to the first
-+revision of the subproject's history that was imported
-+into your project, and git subtree will attempt to build
-+its history from there.</code></pre>
-+</div></div>
-+<div class="literalblock">
-+<div class="content">
-+<pre><code>If you used 'git subtree add', you should never need
-+this option.</code></pre>
-+</div></div>
++<div class="paragraph"><p>If your subtree was originally imported using something other than git
++subtree, its history may not match what git subtree is expecting.  In
++that case, you can specify the commit id &lt;onto&gt; that corresponds to the
++first revision of the subproject&#8217;s history that was imported into your
++project, and git subtree will attempt to build its history from there.</p></div>
++<div class="paragraph"><p>If you used <em>git subtree add</em>, you should never need this option.</p></div>
 +</dd>
 +<dt class="hdlist1">
 +--rejoin
@@ -1110,34 +1051,19 @@
 +<p>
 +        This option is only valid for the split command.
 +</p>
-+<div class="literalblock">
-+<div class="content">
-+<pre><code>After splitting, merge the newly created synthetic
-+history back into your main project.  That way, future
-+splits can search only the part of history that has
-+been added since the most recent --rejoin.</code></pre>
-+</div></div>
-+<div class="literalblock">
-+<div class="content">
-+<pre><code>If your split commits end up merged into the upstream
-+subproject, and then you want to get the latest upstream
-+version, this will allow git's merge algorithm to more
-+intelligently avoid conflicts (since it knows these
-+synthetic commits are already part of the upstream
-+repository).</code></pre>
-+</div></div>
-+<div class="literalblock">
-+<div class="content">
-+<pre><code>Unfortunately, using this option results in 'git log'
-+showing an extra copy of every new commit that was
-+created (the original, and the synthetic one).</code></pre>
-+</div></div>
-+<div class="literalblock">
-+<div class="content">
-+<pre><code>If you do all your merges with '--squash', don't use
-+'--rejoin' when you split, because you don't want the
-+subproject's history to be part of your project anyway.</code></pre>
-+</div></div>
++<div class="paragraph"><p>After splitting, merge the newly created synthetic history back into
++your main project.  That way, future splits can search only the part of
++history that has been added since the most recent --rejoin.</p></div>
++<div class="paragraph"><p>If your split commits end up merged into the upstream subproject, and
++then you want to get the latest upstream version, this will allow git&#8217;s
++merge algorithm to more intelligently avoid conflicts (since it knows
++these synthetic commits are already part of the upstream repository).</p></div>
++<div class="paragraph"><p>Unfortunately, using this option results in <em>git log</em> showing an extra
++copy of every new commit that was created (the original, and the
++synthetic one).</p></div>
++<div class="paragraph"><p>If you do all your merges with <em>--squash</em>, don&#8217;t use <em>--rejoin</em> when you
++split, because you don&#8217;t want the subproject&#8217;s history to be part of
++your project anyway.</p></div>
 +</dd>
 +</dl></div>
 +</div>
@@ -1275,7 +1201,7 @@
 +<div id="footnotes"><hr /></div>
 +<div id="footer">
 +<div id="footer-text">
-+Last updated 2014-02-14 22:57:09 CET
++Last updated 2015-02-05 22:40:08 CET
 +</div>
 +</div>
 +</body>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150206/ccacdeb1/attachment-0001.html>

More information about the macports-changes mailing list