sha1_name.c: get_sha1_1() takes lookup flags
Junio C Hamano committed over 14 years ago
sha1_name.c: get_describe_name() by definition groks only commits
Junio C Hamano committed over 14 years ago
rerere: make rr-cache fanout directory honor umask
Junio C Hamano committed over 14 years ago
Junio C Hamano committed over 14 years ago
apply: allow rerere() to work on --3way results
Junio C Hamano committed over 14 years ago
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