index
:
tgif.git
2.36
Terin's Improved Git Fork
terinjokes@gmail.com
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
merge-recursive.c
Age
Commit message (
Expand
)
Author
Files
Lines
2011-08-14
merge-recursive: Make dead code for rename/rename(2to1) conflicts undead
Elijah Newren
1
-22
/
+48
2011-08-14
merge-recursive: Fix deletion of untracked file in rename/delete conflicts
Elijah Newren
1
-1
/
+2
2011-08-14
merge-recursive: Split update_stages_and_entry; only update stages at end
Elijah Newren
1
-18
/
+17
2011-08-14
merge-recursive: Allow make_room_for_path() to remove D/F entries
Elijah Newren
1
-4
/
+22
2011-08-14
merge-recursive: Split was_tracked() out of would_lose_untracked()
Elijah Newren
1
-3
/
+8
2011-08-14
merge-recursive: Save D/F conflict filenames instead of unlinking them
Elijah Newren
1
-16
/
+24
2011-08-14
merge-recursive: Fix code checking for D/F conflicts still being present
Elijah Newren
1
-15
/
+34
2011-08-14
merge-recursive: Fix sorting order and directory change assumptions
Elijah Newren
1
-5
/
+35
2011-08-14
merge-recursive: Fix recursive case with D/F conflict via add/add conflict
Elijah Newren
1
-0
/
+2
2011-08-14
merge-recursive: Avoid working directory changes during recursive case
Elijah Newren
1
-0
/
+7
2011-08-14
merge-recursive: Remember to free generated unique path names
Elijah Newren
1
-8
/
+12
2011-08-14
merge-recursive: Consolidate different update_stages functions
Elijah Newren
1
-18
/
+9
2011-08-14
merge-recursive: Mark some diff_filespec struct arguments const
Elijah Newren
1
-9
/
+10
2011-08-14
merge-recursive: Correct a comment
Elijah Newren
1
-1
/
+1
2011-08-14
merge-recursive: Make BUG message more legible by adding a newline
Elijah Newren
1
-1
/
+1
2011-07-12
teach --histogram to diff
Tay Ray Chuan
1
-0
/
+2
2011-05-31
Merge branch 'jc/rename-degrade-cc-to-c' into maint
Junio C Hamano
1
-7
/
+3
2011-05-19
Revert "Merge branch 'en/merge-recursive'"
Junio C Hamano
1
-18
/
+6
2011-05-14
Merge branch 'maint'
Junio C Hamano
1
-3
/
+3
2011-05-14
add, merge, diff: do not use strcasecmp to compare config variable names
Jonathan Nieder
1
-3
/
+3
2011-05-06
Merge branch 'nd/struct-pathspec'
Junio C Hamano
1
-1
/
+3
2011-04-28
Merge branch 'jc/rename-degrade-cc-to-c'
Junio C Hamano
1
-7
/
+3
2011-04-28
Merge branch 'en/merge-recursive'
Junio C Hamano
1
-6
/
+18
2011-04-03
Fix two unused variable warnings in gcc 4.6
Dan McGee
1
-4
/
+0
2011-03-25
Convert read_tree{,_recursive} to support struct pathspec
Nguyễn Thái Ngọc Duy
1
-1
/
+3
2011-03-22
diffcore-rename: fall back to -C when -C -C busts the rename limit
Junio C Hamano
1
-7
/
+3
2011-03-19
Merge branch 'jk/merge-rename-ux'
Junio C Hamano
1
-2
/
+11
2011-03-17
merge-recursive: tweak magic band-aid
Junio C Hamano
1
-1
/
+8
2011-03-16
Merge branch 'maint'
Junio C Hamano
1
-8
/
+4
2011-03-16
standardize brace placement in struct definitions
Jonathan Nieder
1
-8
/
+4
2011-03-02
merge-recursive: When we detect we can skip an update, actually skip it
Elijah Newren
1
-6
/
+11
2011-02-26
strbuf: add strbuf_vaddf
Jeff King
1
-14
/
+1
2011-02-21
merge: enable progress reporting for rename detection
Jeff King
1
-0
/
+1
2011-02-21
bump rename limit defaults (again)
Jeff King
1
-1
/
+1
2011-02-21
merge: improve inexact rename limit warning
Jeff King
1
-1
/
+9
2010-11-29
Merge branch 'en/merge-recursive'
Junio C Hamano
1
-223
/
+429
2010-10-26
Merge branch 'kb/merge-recursive-rename-threshold'
Junio C Hamano
1
-0
/
+6
2010-10-26
Merge branch 'jf/merge-ignore-ws'
Junio C Hamano
1
-11
/
+41
2010-10-21
merge-recursive:make_room_for_directories - work around dumb compilers
Junio C Hamano
1
-1
/
+1
2010-09-29
merge-recursive: Remove redundant path clearing for D/F conflicts
Elijah Newren
1
-15
/
+2
2010-09-29
merge-recursive: Make room for directories in D/F conflicts
Elijah Newren
1
-0
/
+58
2010-09-29
handle_delete_modify(): Check whether D/F conflicts are still present
Elijah Newren
1
-9
/
+16
2010-09-29
merge_content(): Check whether D/F conflicts are still present
Elijah Newren
1
-2
/
+20
2010-09-29
conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts
Elijah Newren
1
-4
/
+3
2010-09-29
conflict_rename_delete(): Check whether D/F conflicts are still present
Elijah Newren
1
-0
/
+8
2010-09-29
merge-recursive: Delay modify/delete conflicts if D/F conflict present
Elijah Newren
1
-0
/
+9
2010-09-29
merge-recursive: Delay content merging for renames
Elijah Newren
1
-36
/
+15
2010-09-29
merge-recursive: Delay handling of rename/delete conflicts
Elijah Newren
1
-2
/
+20
2010-09-29
merge-recursive: Move handling of double rename of one file to other file
Elijah Newren
1
-26
/
+6
2010-09-29
merge-recursive: Move handling of double rename of one file to two
Elijah Newren
1
-16
/
+41
[prev]
[next]