Files
git/Documentation
Jonathan Nieder ebef7e5049 Documentation: simplify How Merge Works
The user most likely does not care about the exact order of
operations because he cannot see it happening anyway.  Instead,
try to explain what it means to merge two commits into a single
tree.

While at it:

 - Change the heading to TRUE MERGE.  The entire manual page is
   about how merges work.

 - Document MERGE_HEAD.  It is a useful feature, since it makes
   the parents of the intended merge commit easier to refer to.

 - Do not assume commits named on the 'git merge' command line come
   from another repository.  For simplicity, the discussion of
   conflicts still does assume that there is only one and it is a
   branch head.

 - Do not start list items with `code`.  Otherwise, a toolchain bug
   produces a line break in the generated nroff, resulting in odd
   extra space.

Suggested-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
2010-01-24 13:57:42 +01:00
..
2009-10-01 08:21:35 -04:00
2009-12-19 23:20:16 -08:00
2009-04-06 00:27:09 -07:00
2009-12-05 11:39:13 -08:00
2009-11-30 14:44:22 -08:00
2008-12-16 22:06:47 -08:00
2008-12-16 22:08:28 -08:00
2008-12-16 22:13:36 -08:00
2008-08-24 14:47:24 -07:00
2008-10-21 13:37:42 -07:00
2008-12-07 15:11:54 -08:00
2008-12-19 19:27:35 -08:00
2009-02-07 00:51:47 -08:00
2009-05-03 15:29:31 -07:00
2008-12-24 19:41:08 -08:00
2009-03-15 13:05:05 -07:00
2009-04-02 12:34:16 -07:00
2009-04-12 15:57:58 -07:00
2009-04-19 17:34:26 -07:00
2009-05-03 16:54:14 -07:00
2009-03-03 23:37:19 -08:00
2009-05-12 22:30:29 -07:00
2009-06-03 22:47:48 -07:00
2009-06-21 21:15:50 -07:00
2009-07-28 23:59:30 -07:00
2009-05-06 18:16:40 -07:00
2009-08-21 20:16:10 -07:00
2009-08-29 14:31:01 -07:00
2009-09-13 01:28:13 -07:00
2009-09-16 14:53:26 -07:00
2009-07-29 00:32:42 -07:00
2009-10-16 23:57:19 -07:00
2009-10-25 18:37:56 -07:00
2009-11-16 00:05:12 -08:00
2009-12-02 10:29:00 -08:00
2009-12-05 11:08:35 -08:00
2009-12-10 15:42:30 -08:00
2009-12-16 12:45:25 -08:00
2009-10-10 00:05:19 -07:00
2009-12-23 12:23:11 -08:00