index
:
git
master
git
Fast-forward packages
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
merge-recursive.c
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge branch 'en/disable-dir-rename-in-recursive-merge'
Junio C Hamano
2019-08-08
1
-1
/
+2
|
\
|
*
merge-recursive: avoid directory rename detection in recursive case
Elijah Newren
2019-08-06
1
-1
/
+2
*
|
Use the right 'struct repository' instead of the_repository
Nguyễn Thái Ngọc Duy
2019-06-27
1
-15
/
+20
*
|
match-trees.c: remove the_repo from shift_tree*()
Nguyễn Thái Ngọc Duy
2019-06-27
1
-2
/
+2
*
|
tree-walk.c: remove the_repo from get_tree_entry()
Nguyễn Thái Ngọc Duy
2019-06-27
1
-3
/
+5
|
/
*
Merge branch 'en/merge-directory-renames-fix'
Junio C Hamano
2019-06-06
1
-0
/
+1
|
\
|
*
merge-recursive: restore accidentally dropped setting of path
Elijah Newren
2019-06-05
1
-0
/
+1
*
|
Merge branch 'nd/sha1-name-c-wo-the-repository'
Junio C Hamano
2019-05-08
1
-1
/
+6
|
\
\
|
*
|
commit.cocci: refactor code, avoid double rewrite
Nguyễn Thái Ngọc Duy
2019-04-16
1
-1
/
+6
*
|
|
Merge branch 'en/merge-directory-renames'
Junio C Hamano
2019-05-08
1
-938
/
+915
|
\
\
\
|
|
|
/
|
|
/
|
|
*
|
merge-recursive: switch directory rename detection default
Elijah Newren
2019-04-08
1
-23
/
+123
|
*
|
merge-recursive: give callers of handle_content_merge() access to contents
Elijah Newren
2019-04-08
1
-17
/
+20
|
*
|
merge-recursive: track information associated with directory renames
Elijah Newren
2019-04-08
1
-14
/
+23
|
*
|
merge-recursive: switch from (oid,mode) pairs to a diff_filespec
Elijah Newren
2019-04-08
1
-268
/
+215
|
*
|
merge-recursive: cleanup handle_rename_* function signatures
Elijah Newren
2019-04-08
1
-16
/
+15
|
*
|
merge-recursive: track branch where rename occurred in rename struct
Elijah Newren
2019-04-08
1
-71
/
+42
|
*
|
merge-recursive: remove ren[12]_other fields from rename_conflict_info
Elijah Newren
2019-04-08
1
-50
/
+21
|
*
|
merge-recursive: shrink rename_conflict_info
Elijah Newren
2019-04-08
1
-70
/
+50
|
*
|
merge-recursive: move some struct declarations together
Elijah Newren
2019-04-08
1
-39
/
+39
|
*
|
merge-recursive: use 'ci' for rename_conflict_info variable name
Elijah Newren
2019-04-08
1
-23
/
+18
|
*
|
merge-recursive: rename locals 'o' and 'a' to 'obuf' and 'abuf'
Elijah Newren
2019-04-08
1
-8
/
+10
|
*
|
merge-recursive: rename diff_filespec 'one' to 'o'
Elijah Newren
2019-04-08
1
-23
/
+23
|
*
|
merge-recursive: rename merge_options argument from 'o' to 'opt'
Elijah Newren
2019-04-08
1
-492
/
+492
|
*
|
Use 'unsigned short' for mode, like diff_filespec does
Elijah Newren
2019-04-08
1
-3
/
+3
|
|
/
*
/
submodule: avoid hard-coded constants
brian m. carlson
2019-04-01
1
-1
/
+1
|
/
*
Merge branch 'nd/completion-more-parameters'
Junio C Hamano
2019-03-07
1
-0
/
+4
|
\
|
*
completion: add more parameter value completion
Nguyễn Thái Ngọc Duy
2019-02-20
1
-0
/
+4
*
|
merge-recursive: drop several unused parameters
Jeff King
2019-02-15
1
-12
/
+7
|
/
*
Merge branch 'nd/the-index-final'
Junio C Hamano
2019-02-07
1
-88
/
+103
|
\
|
*
read-cache.c: remove the_* from index_has_changes()
Nguyễn Thái Ngọc Duy
2019-01-14
1
-1
/
+1
|
*
merge-recursive.c: remove implicit dependency on the_repository
Nguyễn Thái Ngọc Duy
2019-01-14
1
-21
/
+24
|
*
merge-recursive.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
2019-01-14
1
-68
/
+80
|
*
read-cache.c: kill read_index()
Nguyễn Thái Ngọc Duy
2019-01-14
1
-1
/
+1
|
*
repository.c: replace hold_locked_index() with repo_hold_locked_index()
Nguyễn Thái Ngọc Duy
2019-01-14
1
-1
/
+1
*
|
Merge branch 'nd/attr-pathspec-in-tree-walk'
Junio C Hamano
2019-01-15
1
-1
/
+2
|
\
\
|
|
/
|
/
|
|
*
tree.c: make read_tree*() take 'struct repository *'
Nguyễn Thái Ngọc Duy
2018-11-19
1
-1
/
+2
*
|
Merge branch 'en/merge-path-collision'
Junio C Hamano
2019-01-04
1
-213
/
+316
|
\
\
|
|
/
|
/
|
|
*
merge-recursive: combine error handling
Derrick Stolee
2018-11-08
1
-26
/
+27
|
*
merge-recursive: improve rename/rename(1to2)/add[/add] handling
Elijah Newren
2018-11-08
1
-77
/
+77
|
*
merge-recursive: use handle_file_collision for add/add conflicts
Elijah Newren
2018-11-08
1
-8
/
+21
|
*
merge-recursive: improve handling for rename/rename(2to1) conflicts
Elijah Newren
2018-11-08
1
-90
/
+14
|
*
merge-recursive: fix rename/add conflict handling
Elijah Newren
2018-11-08
1
-51
/
+86
|
*
merge-recursive: new function for better colliding conflict resolutions
Elijah Newren
2018-11-08
1
-0
/
+121
|
*
merge-recursive: increase marker length with depth of recursion
Elijah Newren
2018-11-08
1
-8
/
+17
*
|
Merge branch 'en/merge-cleanup-more'
Junio C Hamano
2018-11-02
1
-3
/
+33
|
\
|
|
*
merge-recursive: avoid showing conflicts with merge branch before HEAD
Elijah Newren
2018-10-18
1
-1
/
+31
|
*
merge-recursive: improve auto-merging messages with path collisions
Elijah Newren
2018-10-18
1
-2
/
+2
*
|
Merge branch 'nd/the-index'
Junio C Hamano
2018-10-19
1
-3
/
+4
|
\
\
|
*
|
revision.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
2018-09-21
1
-1
/
+1
|
*
|
ll-merge.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
2018-09-21
1
-1
/
+2
[next]