[07/50] [abbrv] git commit: updated refs/heads/master to 17e0b7c

[kx...@apache.org]

Add missed Replication-Git comparison authorship.


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/627806e2
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/627806e2
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/627806e2

Branch: refs/heads/master
Commit: 627806e25628861481f760acddfd6eb2ded0b13e
Parents: a103e74
Author: Alexander Shorin <kx...@apache.org>
Authored: Mon Aug 26 20:27:53 2013 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Fri Sep 27 22:01:47 2013 +0400

----------------------------------------------------------------------
 share/doc/src/replication/conflicts.rst | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/627806e2/share/doc/src/replication/conflicts.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/replication/conflicts.rst b/share/doc/src/replication/conflicts.rst
index d0149b0..354c286 100644
--- a/share/doc/src/replication/conflicts.rst
+++ b/share/doc/src/replication/conflicts.rst
@@ -702,9 +702,15 @@ to use "history rewriting" to make git forget commits earlier than a particular
 one.
 
 
+.. _replication/conflicts/git:
+
 What is the CouchDB replication protocol? Is it like Git?
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+:Author: Jason Smith
+:Date: 2011-01-29
+:Source: http://stackoverflow.com/questions/4766391/what-is-the-couchdb-replication-protocol-is-it-like-git
+
 **Key points**
 
 **If you know Git, then you know how Couch replication works.** Replicating is