Files
git/Documentation
Junio C Hamano 0cf8581e33 checkout -m: recreate merge when checking out of unmerged index
This teaches git-checkout to recreate a merge out of unmerged
index entries while resolving conflicts.

With this patch, checking out an unmerged path from the index
now have the following possibilities:

 * Without any option, an attempt to checkout an unmerged path
   will atomically fail (i.e. no other cleanly-merged paths are
   checked out either);

 * With "-f", other cleanly-merged paths are checked out, and
   unmerged paths are ignored;

 * With "--ours" or "--theirs, the contents from the specified
   stage is checked out;

 * With "-m" (we should add "--merge" as synonym), the 3-way merge
   is recreated from the staged object names and checked out.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-30 19:57:55 -07:00
..
2008-08-01 23:21:44 -07:00
2007-08-10 11:32:42 -07:00
2008-04-22 21:53:37 -07:00
2008-08-16 02:32:36 -07:00
2008-07-09 16:58:21 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-07-05 18:33:16 -07:00
2008-08-01 23:21:44 -07:00
2008-08-06 13:50:48 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-02 11:58:34 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-09 01:40:08 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-09 01:40:08 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-08 18:27:19 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-08-01 23:21:44 -07:00
2008-07-05 18:33:16 -07:00
2008-08-29 00:14:29 -07:00
2008-06-06 11:18:28 -07:00
2008-08-09 01:40:08 -07:00
2007-08-15 15:01:20 -07:00
2007-09-19 03:11:28 -07:00
2008-01-29 22:00:34 -08:00
2007-10-03 02:33:48 -07:00
2007-11-18 14:00:38 -08:00
2007-12-01 11:20:00 -08:00
2008-01-07 22:41:43 -08:00
2008-02-17 00:20:38 -08:00
2008-02-17 00:20:38 -08:00
2008-02-23 11:31:04 -08:00
2008-06-26 17:11:21 -07:00
2008-02-01 19:10:10 -08:00
2008-04-20 11:36:53 -07:00
2008-05-25 21:11:24 -07:00
2008-05-27 22:32:47 -07:00
2008-06-07 11:45:48 -07:00
2008-06-26 17:59:51 -07:00
2008-04-07 21:57:43 -07:00
2008-06-25 17:13:48 -07:00
2008-07-04 01:38:41 -07:00
2008-07-13 15:23:43 -07:00
2008-07-19 10:58:01 -07:00
2008-08-06 13:40:53 -07:00
2008-06-18 13:09:43 -07:00
2008-08-24 14:47:24 -07:00
2008-08-17 11:42:10 -07:00
2008-08-12 22:46:22 -07:00