Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
merge-recursive.c
Age
Commit message (
Expand
)
Author
2011-08-15
merge-recursive: Consider modifications in rename/rename(2to1) conflicts
Elijah Newren
2011-08-15
merge-recursive: Create function for merging with branchname:file markers
Elijah Newren
2011-08-15
merge-recursive: Record more data needed for merging with dual renames
Elijah Newren
2011-08-15
merge-recursive: Defer rename/rename(2to1) handling until process_entry
Elijah Newren
2011-08-15
merge-recursive: Small cleanups for conflict_rename_rename_1to2
Elijah Newren
2011-08-15
merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
Elijah Newren
2011-08-15
merge-recursive: Introduce a merge_file convenience function
Elijah Newren
2011-08-15
merge-recursive: Fix modify/delete resolution in the recursive case
Elijah Newren
2011-08-15
merge-recursive: When we detect we can skip an update, actually skip it
Elijah Newren
2011-08-15
merge-recursive: Provide more info in conflict markers with file renames
Elijah Newren
2011-08-15
merge-recursive: Cleanup and consolidation of rename_conflict_info
Elijah Newren
2011-08-15
merge-recursive: Consolidate process_entry() and process_df_entry()
Elijah Newren
2011-08-15
merge-recursive: Improve handling of rename target vs. directory addition
Elijah Newren
2011-08-15
merge-recursive: Add comments about handling rename/add-source cases
Elijah Newren
2011-08-15
merge-recursive: Make dead code for rename/rename(2to1) conflicts undead
Elijah Newren
2011-08-15
merge-recursive: Fix deletion of untracked file in rename/delete conflicts
Elijah Newren
2011-08-15
merge-recursive: Split update_stages_and_entry; only update stages at end
Elijah Newren
2011-08-15
merge-recursive: Allow make_room_for_path() to remove D/F entries
Elijah Newren
2011-08-15
merge-recursive: Split was_tracked() out of would_lose_untracked()
Elijah Newren
2011-08-15
merge-recursive: Save D/F conflict filenames instead of unlinking them
Elijah Newren
2011-08-15
merge-recursive: Fix code checking for D/F conflicts still being present
Elijah Newren
2011-08-15
merge-recursive: Fix sorting order and directory change assumptions
Elijah Newren
2011-08-15
merge-recursive: Fix recursive case with D/F conflict via add/add conflict
Elijah Newren
2011-08-15
merge-recursive: Avoid working directory changes during recursive case
Elijah Newren
2011-08-15
merge-recursive: Remember to free generated unique path names
Elijah Newren
2011-08-15
merge-recursive: Consolidate different update_stages functions
Elijah Newren
2011-08-15
merge-recursive: Mark some diff_filespec struct arguments const
Elijah Newren
2011-08-15
merge-recursive: Correct a comment
Elijah Newren
2011-08-15
merge-recursive: Make BUG message more legible by adding a newline
Elijah Newren
2011-05-31
Merge branch 'jc/rename-degrade-cc-to-c' into maint
Junio C Hamano
2011-05-15
add, merge, diff: do not use strcasecmp to compare config variable names
Jonathan Nieder
2011-04-03
Fix two unused variable warnings in gcc 4.6
Dan McGee
2011-03-23
diffcore-rename: fall back to -C when -C -C busts the rename limit
Junio C Hamano
2011-03-20
Merge branch 'jk/merge-rename-ux'
Junio C Hamano
2011-03-17
Merge branch 'maint'
Junio C Hamano
2011-03-16
standardize brace placement in struct definitions
Jonathan Nieder
2011-02-26
strbuf: add strbuf_vaddf
Jeff King
2011-02-21
merge: enable progress reporting for rename detection
Jeff King
2011-02-21
bump rename limit defaults (again)
Jeff King
2011-02-21
merge: improve inexact rename limit warning
Jeff King
2010-11-30
Merge branch 'en/merge-recursive'
Junio C Hamano
2010-10-27
Merge branch 'kb/merge-recursive-rename-threshold'
Junio C Hamano
2010-10-27
Merge branch 'jf/merge-ignore-ws'
Junio C Hamano
2010-10-21
merge-recursive:make_room_for_directories - work around dumb compilers
Junio C Hamano
2010-09-30
merge-recursive: Remove redundant path clearing for D/F conflicts
Elijah Newren
2010-09-30
merge-recursive: Make room for directories in D/F conflicts
Elijah Newren
2010-09-30
handle_delete_modify(): Check whether D/F conflicts are still present
Elijah Newren
2010-09-30
merge_content(): Check whether D/F conflicts are still present
Elijah Newren
2010-09-30
conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts
Elijah Newren
2010-09-30
conflict_rename_delete(): Check whether D/F conflicts are still present
Elijah Newren
[next]