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 '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
|
*
diff.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
2018-09-21
1
-1
/
+1
*
|
Merge branch 'en/merge-cleanup'
Junio C Hamano
2018-10-16
1
-93
/
+51
|
\
\
|
*
|
merge-recursive: rename merge_file_1() and merge_content()
Elijah Newren
2018-09-20
1
-32
/
+34
|
*
|
merge-recursive: remove final remaining caller of merge_file_one()
Elijah Newren
2018-09-20
1
-27
/
+17
|
*
|
merge-recursive: avoid wrapper function when unnecessary and wasteful
Elijah Newren
2018-09-20
1
-4
/
+1
|
*
|
merge-recursive: set paths correctly when three-way merging content
Elijah Newren
2018-09-20
1
-40
/
+9
*
|
|
Merge branch 'en/double-semicolon-fix'
Junio C Hamano
2018-09-24
1
-1
/
+1
|
\
\
\
|
|
/
/
|
/
|
|
|
*
|
Remove superfluous trailing semicolons
Elijah Newren
2018-09-05
1
-1
/
+1
*
|
|
Merge branch 'jk/cocci'
Junio C Hamano
2018-09-17
1
-2
/
+2
|
\
\
\
|
*
|
|
convert "oidcmp() == 0" to oideq()
Jeff King
2018-08-29
1
-2
/
+2
*
|
|
|
Merge branch 'ds/reachable'
Junio C Hamano
2018-09-17
1
-0
/
+1
|
\
\
\
\
|
|
_
|
_
|
/
|
/
|
|
|
|
*
|
|
commit.h: remove method declarations
Derrick Stolee
2018-07-21
1
-0
/
+1
*
|
|
|
Merge branch 'en/directory-renames-nothanks'
Junio C Hamano
2018-09-04
1
-5
/
+13
|
\
\
\
\
|
|
_
|
/
/
|
/
|
|
|
|
*
|
|
merge-recursive: add ability to turn off directory rename detection
Elijah Newren
2018-08-30
1
-5
/
+13
|
|
|
/
|
|
/
|
*
|
|
Merge branch 'nd/no-the-index'
Junio C Hamano
2018-08-20
1
-1
/
+1
|
\
\
\
|
*
|
|
convert.c: remove an implicit dependency on the_index
Nguyễn Thái Ngọc Duy
2018-08-13
1
-1
/
+1
*
|
|
|
Merge branch 'en/merge-recursive-skip-fix'
Junio C Hamano
2018-08-16
1
-0
/
+16
|
\
\
\
\
|
|
/
/
/
|
/
|
|
|
|
*
|
|
merge-recursive: preserve skip_worktree bit when necessary
Elijah Newren
2018-07-27
1
-0
/
+16
|
|
/
/
*
|
|
Merge branch 'en/dirty-merge-fixes'
Junio C Hamano
2018-08-03
1
-7
/
+7
|
\
\
\
|
*
|
|
merge-recursive: enforce rule that index matches head before merging
Elijah Newren
2018-07-11
1
-7
/
+7
|
*
|
|
merge-recursive: fix assumption that head tree being merged is HEAD
Elijah Newren
2018-07-11
1
-1
/
+1
|
*
|
|
merge-recursive: make sure when we say we abort that we actually abort
Elijah Newren
2018-07-11
1
-2
/
+2
|
*
|
|
index_has_changes(): avoid assuming operating on the_index
Elijah Newren
2018-07-03
1
-1
/
+1
*
|
|
|
Merge branch 'jm/cache-entry-from-mem-pool'
Junio C Hamano
2018-08-03
1
-2
/
+2
|
\
\
\
\
|
*
|
|
|
block alloc: add lifecycle APIs for cache_entry structs
Jameson Miller
2018-07-03
1
-1
/
+1
|
*
|
|
|
read-cache: teach make_cache_entry to take object_id
Jameson Miller
2018-07-03
1
-1
/
+1
|
*
|
|
|
read-cache: teach refresh_cache_entry to take istate
Jameson Miller
2018-07-03
1
-1
/
+1
|
|
|
/
/
|
|
/
|
|
*
|
|
|
Merge branch 'sb/object-store-lookup'
Junio C Hamano
2018-08-03
1
-7
/
+10
|
\
\
\
\
|
|
|
_
|
/
|
|
/
|
|
|
*
|
|
tag: add repository argument to deref_tag
Stefan Beller
2018-06-29
1
-1
/
+2
|
*
|
|
commit: add repository argument to lookup_commit_reference
Stefan Beller
2018-06-29
1
-3
/
+3
|
*
|
|
tree: add repository argument to lookup_tree
Stefan Beller
2018-06-29
1
-3
/
+3
|
*
|
|
object: add repository argument to parse_object
Stefan Beller
2018-06-29
1
-1
/
+3
|
*
|
|
Merge branch 'sb/object-store-grafts' into sb/object-store-lookup
Junio C Hamano
2018-06-29
1
-0
/
+1
|
|
\
\
\
*
|
\
\
\
Merge branch 'sb/object-store-grafts'
Junio C Hamano
2018-07-18
1
-0
/
+1
|
\
\
\
\
\
|
|
|
/
/
/
|
|
/
|
|
|
|
*
|
|
|
object-store: move object access functions to object-store.h
Stefan Beller
2018-05-16
1
-0
/
+1
*
|
|
|
|
Merge branch 'en/merge-recursive-cleanup'
Junio C Hamano
2018-07-18
1
-82
/
+104
|
\
\
\
\
\
|
|
_
|
/
/
/
|
/
|
|
|
|
|
*
|
|
|
merge-recursive: add pointer about unduly complex looking code
Elijah Newren
2018-06-12
1
-0
/
+15
|
*
|
|
|
merge-recursive: rename conflict_rename_*() family of functions
Elijah Newren
2018-06-12
1
-43
/
+43
|
*
|
|
|
merge-recursive: clarify the rename_dir/RENAME_DIR meaning
Elijah Newren
2018-06-12
1
-11
/
+17
|
*
|
|
|
merge-recursive: align labels with their respective code blocks
Elijah Newren
2018-06-12
1
-3
/
+3
|
*
|
|
|
merge-recursive: fix numerous argument alignment issues
Elijah Newren
2018-06-12
1
-37
/
+38
|
*
|
|
|
merge-recursive: fix miscellaneous grammar error in comment
Elijah Newren
2018-06-12
1
-1
/
+1
*
|
|
|
|
Merge branch 'sb/object-store-alloc'
Junio C Hamano
2018-06-25
1
-1
/
+2
|
\
\
\
\
\
|
|
|
/
/
/
|
|
/
|
|
|
|
*
|
|
|
alloc: allow arbitrary repositories for alloc functions
Stefan Beller
2018-05-16
1
-0
/
+1
|
*
|
|
|
alloc: add repository argument to alloc_commit_node
Stefan Beller
2018-05-09
1
-1
/
+1
*
|
|
|
|
Merge branch 'nd/commit-util-to-slab'
Junio C Hamano
2018-06-25
1
-3
/
+5
|
\
\
\
\
\
|
|
_
|
_
|
/
/
|
/
|
|
|
|
|
*
|
|
|
merge: use commit-slab in merge remote desc instead of commit->util
Nguyễn Thái Ngọc Duy
2018-05-21
1
-3
/
+5
|
|
/
/
/
[next]
