Differences between version 17 and predecessor to the previous major change of Git.
Other diffs: Previous Revision, Previous Author, or view the Annotated Edit History
| Newer page: | version 17 | Last edited on Saturday, January 31, 2009 1:03:38 pm | by LawrenceDoliveiro | Revert |
| Older page: | version 16 | Last edited on Wednesday, January 14, 2009 12:47:05 am | by AristotlePagaltzis | Revert |
@@ -14,8 +14,10 @@
* On servers without [Git] installed, you should probably use rsync(1). Again, pushing is usually possible.
* Lastly, the slowest option is to simply publish the repository via [HTTP]. If the WebServer supports WebDav, it can even accept pushes.
Note that when using a dumb transport, you must ensure that <tt>git update-server-info</tt> is run in the repository any time someone commits to it (eg. by setting up a hook). This maintains a static file with a stored index of the state of the repository which would be dynamically negotiated between <tt>git fetch-pack</tt> and <tt>git upload-pack</tt> in smart transports.
+
+The main git man page describes Git as “the stupid content tracker”. The only thing “stupid” about the design of Git is that it its data structures are independent of any particular algorithm for merging conflicting changes. The early merge algorithms may not have been very elaborate, but it was possible to add better ones without any changes to the repository format—see the “merging strategies” section of the git-merge man page to see what’s currently available.
!!! Notes
You may encounter the following error:
