Files
git/Documentation
Junio C Hamano f247b10aa0 Merge branch 'jc/apply-3way'
"git apply" learned to wiggle the base version and perform three-way
merge when a patch does not exactly apply to the version you have.

* jc/apply-3way:
  apply: tests for the --3way option
  apply: document --3way option
  apply: allow rerere() to work on --3way results
  apply: register conflicted stages to the index
  apply: --3way with add/add conflict
  apply: move verify_index_match() higher
  apply: plug the three-way merge logic in
  apply: fall back on three-way merge
  apply: accept -3/--3way command line option
  apply: move "already exists" logic to check_to_create()
  apply: move check_to_create_blob() closer to its sole caller
  apply: further split load_preimage()
  apply: refactor "previous patch" logic
  apply: split load_preimage() helper function out
  apply: factor out checkout_target() helper function
  apply: refactor read_file_or_gitlink()
  apply: clear_image() clears things a bit more
  apply: a bit more comments on PATH_TO_BE_DELETED
  apply: fix an incomplete comment in check_patch()
2012-07-15 21:38:51 -07:00
..
2012-03-28 08:47:23 -07:00
2009-10-01 08:21:35 -04:00
2012-07-13 15:48:50 -07:00
2011-08-08 09:30:12 -07:00
2012-06-19 11:35:19 -07:00
2009-04-06 00:27:09 -07:00
2012-04-20 15:49:16 -07:00
2012-07-09 14:40:03 -07:00
2012-05-03 15:13:31 -07:00
2012-06-19 11:35:19 -07:00
2012-06-25 11:24:42 -07:00
2012-03-05 11:32:19 -08:00
2011-12-12 11:52:31 -08:00
2012-07-15 21:38:42 -07:00
2011-09-06 11:42:12 -07:00
2011-05-19 10:55:54 -07:00
2011-03-11 10:59:16 -05:00
2012-04-27 09:26:39 -07:00
2012-07-11 12:59:41 -07:00
2010-07-05 13:39:02 -07:00
2012-06-19 11:35:19 -07:00
2012-06-25 11:24:10 -07:00
2010-07-20 16:59:17 -07:00
2012-06-19 11:35:19 -07:00