mhagger/git-imerge
1
1
Fork 0
mirror of https://github.com/mhagger/git-imerge.git synced 2024-09-21 04:28:11 +03:00
Code Issues Projects Releases Wiki Activity

Complete web links.

Browse Source 
(If a web log is called a "blog", is a web link called a "blink"?)
This commit is contained in:
Michael Haggerty 2013-05-16 16:39:47 +02:00
parent 7854ecd038
commit 2c9656309f
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
README.rst
View File

@ -16,9 +16,11 @@ resolution.
* Allow a merge to be saved, tested, interrupted, published, and
collaborated on while it is in progress.
The theory and benefits of incremental merging are described in minute
detail in a series of blog posts [1]_, as are the benefits of
retaining history when doing a rebase [2]_.
The best thing to read to get started is `git-imerge: A Practical
Introduction`_. If you want more information, the theory and benefits
of incremental merging are described in minute detail in a series of
blog posts [1]_, as are the benefits of retaining history when doing a
rebase [2]_.
Multiple incremental merges can be in progress at the same time. Each
incremental merge has a name, and its progress is recorded in the Git
@ -121,12 +123,17 @@ git-imerge is released as open-source software under the GNU General
Public License (GPL), version 2 or later.
.. _`git-imerge: A Practical Introduction`:
http://softwareswirl.blogspot.com/2013/05/git-imerge-practical-introduction.html
.. [1]
* http://softwareswirl.blogspot.com/2012/12/the-conflict-frontier-of-nightmare-merge.html
* http://softwareswirl.blogspot.com/2012/12/mapping-merge-conflict-frontier.html
* http://softwareswirl.blogspot.com/2012/12/real-world-conflict-diagrams.html
* http://softwareswirl.blogspot.com/
* http://softwareswirl.blogspot.com/
* http://softwareswirl.blogspot.com/2013/05/git-incremental-merge.html
* http://softwareswirl.blogspot.com/2013/05/one-merge-to-rule-them-all.html
* http://softwareswirl.blogspot.com/2013/05/incremental-merge-vs-direct-merge-vs.html
.. [2]
* http://softwareswirl.blogspot.com/2009/04/truce-in-merge-vs-rebase-war.html
* http://softwareswirl.blogspot.com/2009/08/upstream-rebase-just-works-if-history.html

18
git-imerge
View File

@ -24,9 +24,10 @@ Perform the merge between two branches incrementally. If conflicts
are encountered, figure out exactly which pairs of commits conflict,
and present the user with one pairwise conflict at a time.
The theory and benefits of incremental merging are described in minute
detail in a series of blog posts [1], as are the benefits of retaining
history when doing a rebase [2].
The best thing to read to get started is "git-imerge: A Practical
Introduction" [1]. The theory and benefits of incremental merging are
described in minute detail in a series of blog posts [2], as are the
benefits of retaining history when doing a rebase [3].
Multiple incremental merges can be in progress at the same time. Each
incremental merge has a name, and its progress is recorded in the Git
@ -64,7 +65,7 @@ three ways:
as a merge from its original version to its rebased predecessor.
This is a style of rebasing that does not discard the old
version of the branch, and allows an already-published branch to
be rebased. See [2] for more information.
be rebased. See [3] for more information.
Simple operation:
@ -105,16 +106,19 @@ where
--------A---B---C---D BRANCH
This is like a rebase, except that it retains the history of
individual merges. See [2] for more information.
individual merges. See [3] for more information.
[1] http://softwareswirl.blogspot.com/2012/12/the-conflict-frontier-of-nightmare-merge.html
[1] http://softwareswirl.blogspot.com/2013/05/git-imerge-practical-introduction.html
[2] http://softwareswirl.blogspot.com/2012/12/the-conflict-frontier-of-nightmare-merge.html
http://softwareswirl.blogspot.com/2012/12/mapping-merge-conflict-frontier.html
http://softwareswirl.blogspot.com/2012/12/real-world-conflict-diagrams.html
http://softwareswirl.blogspot.com/2013/05/git-incremental-merge.html
http://softwareswirl.blogspot.com/2013/05/one-merge-to-rule-them-all.html
http://softwareswirl.blogspot.com/2013/05/incremental-merge-vs-direct-merge-vs.html
[2] http://softwareswirl.blogspot.com/2009/04/truce-in-merge-vs-rebase-war.html
[3] http://softwareswirl.blogspot.com/2009/04/truce-in-merge-vs-rebase-war.html
http://softwareswirl.blogspot.com/2009/08/upstream-rebase-just-works-if-history.html
http://softwareswirl.blogspot.com/2009/08/rebase-with-history-implementation.html