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
2018-06-12
merge-recursive: fix miscellaneous grammar error in comment
Elijah Newren
1
-1
/
+1
2018-06-11
merge-submodule: reduce output verbosity
Leif Middelschulte
1
-2
/
+2
2018-05-30
Merge branch 'ma/unpack-trees-free-msgs'
Junio C Hamano
1
-14
/
+16
2018-05-30
Merge branch 'sb/submodule-merge-in-merge-recursive'
Junio C Hamano
1
-3
/
+182
2018-05-30
Merge branch 'js/use-bug-macro'
Junio C Hamano
1
-6
/
+6
2018-05-30
Merge branch 'bp/merge-rename-config'
Junio C Hamano
1
-6
/
+25
2018-05-23
Merge branch 'en/rename-directory-detection-reboot'
Junio C Hamano
1
-170
/
+1262
2018-05-23
Merge branch 'ds/lazy-load-trees'
Junio C Hamano
1
-2
/
+3
2018-05-22
unpack_trees_options: free messages when done
Martin Ågren
1
-0
/
+1
2018-05-21
merge: use commit-slab in merge remote desc instead of commit->util
Nguyễn Thái Ngọc Duy
1
-3
/
+5
2018-05-21
merge-recursive: provide pair of `unpack_trees_{start,finish}()`
Elijah Newren
1
-14
/
+15
2018-05-18
merge-recursive: give notice when submodule commit gets fast-forwarded
Leif Middelschulte
1
-0
/
+16
2018-05-16
object-store: move object access functions to object-store.h
Stefan Beller
1
-0
/
+1
2018-05-16
alloc: allow arbitrary repositories for alloc functions
Stefan Beller
1
-0
/
+1
2018-05-16
merge-recursive: i18n submodule merge output and respect verbosity
Stefan Beller
1
-18
/
+15
2018-05-16
submodule.c: move submodule merging to merge-recursive.c
Stefan Beller
1
-0
/
+166
2018-05-09
alloc: add repository argument to alloc_commit_node
Stefan Beller
1
-1
/
+1
2018-05-08
merge: pass aggressive when rename detection is turned off
Ben Peart
1
-0
/
+1
2018-05-08
merge: add merge.renames config setting
Ben Peart
1
-6
/
+24
2018-05-08
merge-recursive: fix check for skipability of working tree updates
Elijah Newren
1
-16
/
+32
2018-05-08
merge-recursive: make "Auto-merging" comment show for other merges
Elijah Newren
1
-26
/
+39
2018-05-08
merge-recursive: fix remainder of was_dirty() to use original index
Elijah Newren
1
-3
/
+3
2018-05-08
merge-recursive: fix was_tracked() to quit lying with some renamed paths
Elijah Newren
1
-24
/
+67
2018-05-08
merge-recursive: avoid triggering add_cacheinfo error with dirty mod
Elijah Newren
1
-1
/
+1
2018-05-08
merge-recursive: move more is_dirty handling to merge_content
Elijah Newren
1
-18
/
+12
2018-05-08
merge-recursive: improve add_cacheinfo error handling
Elijah Newren
1
-5
/
+8
2018-05-08
merge-recursive: avoid spurious rename/rename conflict from dir renames
Elijah Newren
1
-2
/
+2
2018-05-08
merge-recursive: fix remaining directory rename + dirty overwrite cases
Elijah Newren
1
-3
/
+22
2018-05-08
merge-recursive: fix overwriting dirty files involved in renames
Elijah Newren
1
-19
/
+66
2018-05-08
merge-recursive: avoid clobbering untracked files with directory renames
Elijah Newren
1
-2
/
+40
2018-05-08
merge-recursive: apply necessary modifications for directory renames
Elijah Newren
1
-1
/
+186
2018-05-08
merge-recursive: when comparing files, don't include trees
Elijah Newren
1
-6
/
+21
2018-05-08
merge-recursive: check for file level conflicts then get new name
Elijah Newren
1
-8
/
+166
2018-05-08
merge-recursive: add computation of collisions due to dir rename & merging
Elijah Newren
1
-3
/
+143
2018-05-08
merge-recursive: check for directory level conflicts
Elijah Newren
1
-0
/
+119
2018-05-08
merge-recursive: add get_directory_renames()
Elijah Newren
1
-3
/
+221
2018-05-06
Replace all die("BUG: ...") calls by BUG() ones
Johannes Schindelin
1
-6
/
+6
2018-04-20
merge-recursive: make a helper function for cleanup for handle_renames
Elijah Newren
1
-10
/
+13
2018-04-20
merge-recursive: split out code for determining diff_filepairs
Elijah Newren
1
-22
/
+62
2018-04-20
merge-recursive: make !o->detect_rename codepath more obvious
Elijah Newren
1
-2
/
+9
2018-04-20
merge-recursive: fix leaks of allocated renames and diff_filepairs
Elijah Newren
1
-5
/
+15
2018-04-20
merge-recursive: introduce new functions to handle rename logic
Elijah Newren
1
-10
/
+33
2018-04-20
merge-recursive: move the get_renames() function
Elijah Newren
1
-69
/
+70
2018-04-11
Revert "Merge branch 'en/rename-directory-detection'"
Junio C Hamano
1
-1132
/
+111
2018-04-11
treewide: replace maybe_tree with accessor methods
Derrick Stolee
1
-2
/
+2
2018-04-11
treewide: rename tree to maybe_tree
Derrick Stolee
1
-2
/
+3
2018-04-10
Merge branch 'bc/object-id'
Junio C Hamano
1
-19
/
+19
2018-04-10
Merge branch 'en/rename-directory-detection'
Junio C Hamano
1
-111
/
+1132
2018-03-21
Merge branch 'rj/warning-uninitialized-fix'
Junio C Hamano
1
-1
/
+1
2018-03-20
-Wuninitialized: remove some 'init-self' workarounds
Ramsay Jones
1
-1
/
+1
[prev]
[next]