merge-recursive: fix remaining directory rename + dirty overwrite cases
Elijah Newren committed over 8 years ago
merge-recursive: fix overwriting dirty files involved in renames
Elijah Newren committed over 8 years ago
merge-recursive: avoid clobbering untracked files with directory renames
Elijah Newren committed over 8 years ago
merge-recursive: apply necessary modifications for directory renames
Elijah Newren committed over 8 years ago
merge-recursive: when comparing files, don't include trees
Elijah Newren committed over 8 years ago
merge-recursive: check for file level conflicts then get new name
Elijah Newren committed over 8 years ago
merge-recursive: add computation of collisions due to dir rename & merging
Elijah Newren committed over 8 years ago
merge-recursive: check for directory level conflicts
Elijah Newren committed over 8 years ago
merge-recursive: add get_directory_renames()
Elijah Newren committed over 8 years ago
Junio C Hamano committed over 8 years ago
Merge branch 'ma/http-walker-no-partial'
Junio C Hamano committed over 8 years ago
Merge branch 'js/runtime-prefix'
Junio C Hamano committed over 8 years ago
Merge branch 'js/colored-push-errors'
Junio C Hamano committed over 8 years ago
Merge branch 'jc/parseopt-expiry-errors'
Junio C Hamano committed over 8 years ago
Merge branch 'ma/fast-export-skip-merge-fix'
Junio C Hamano committed over 8 years ago
Merge branch 'tz/doc-git-urls-reference'
Junio C Hamano committed over 8 years ago
Merge branch 'tg/demote-stash-save-in-completion'
Junio C Hamano committed over 8 years ago
Merge branch 'sa/send-email-dedup-some-headers'
Junio C Hamano committed over 8 years ago
Merge branch 'nd/submodule-status-fix'
Junio C Hamano committed over 8 years ago
Merge branch 'js/ident-date-fix'
Junio C Hamano committed over 8 years ago