apply: register conflicted stages to the index

Junio C Hamano committed over 14 years ago

apply: --3way with add/add conflict

Junio C Hamano committed over 14 years ago

apply: move verify_index_match() higher

Junio C Hamano committed over 14 years ago

apply: plug the three-way merge logic in

Junio C Hamano committed over 14 years ago

apply: fall back on three-way merge

Junio C Hamano committed over 14 years ago

apply: accept -3/--3way command line option

Junio C Hamano committed over 14 years ago

apply: move "already exists" logic to check_to_create()

Junio C Hamano committed over 14 years ago

apply: move check_to_create_blob() closer to its sole caller

Junio C Hamano committed over 14 years ago

apply: further split load_preimage()

Junio C Hamano committed over 14 years ago

apply: refactor "previous patch" logic

Junio C Hamano committed over 14 years ago

apply: split load_preimage() helper function out

Junio C Hamano committed over 14 years ago

apply: factor out checkout_target() helper function

Junio C Hamano committed over 14 years ago

apply: refactor read_file_or_gitlink()

Junio C Hamano committed over 14 years ago

apply: clear_image() clears things a bit more

Junio C Hamano committed over 14 years ago

apply: a bit more comments on PATH_TO_BE_DELETED

Junio C Hamano committed over 14 years ago

apply: fix an incomplete comment in check_patch()

Junio C Hamano committed over 14 years ago

Restore umasks influence on the permissions of work tree created by clone

Alex Riesen committed over 14 years ago

Allow edit of empty message with commit --amend

Chris Webb committed over 14 years ago

Merge git://github.com/git-l10n/git-po

Junio C Hamano committed over 14 years ago

Fifth batch for 1.7.12

Junio C Hamano committed over 14 years ago