diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-15 21:38:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-15 21:38:51 -0700 |
| commit | f247b10aa0f75727f1b4bdd67b060720b8219b29 (patch) | |
| tree | 035ac9a93ea44a8027141bb158be646b17d1e9e5 /builtin/reset.c | |
| parent | 0cd993a778d7c14bed34f624fce46724242557ed (diff) | |
| parent | fdac508933cb2b5265d0bb239eaa50aaa5e64981 (diff) | |
| download | git-f247b10aa0f75727f1b4bdd67b060720b8219b29.tar.gz git-f247b10aa0f75727f1b4bdd67b060720b8219b29.tar.xz | |
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()
Diffstat (limited to 'builtin/reset.c')
0 files changed, 0 insertions, 0 deletions