index
:
git.git
main
maint
master
next
seen
todo
The core git plumbing
Junio C. Hamano
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
merge-recursive.c
Age
Commit message (
Expand
)
Author
Files
Lines
2018-08-30
merge-recursive: add ability to turn off directory rename detection
Elijah Newren
1
-5
/
+13
2018-08-29
convert "oidcmp() == 0" to oideq()
Jeff King
1
-2
/
+2
2018-08-20
Merge branch 'nd/no-the-index'
Junio C Hamano
1
-1
/
+1
2018-08-15
Merge branch 'en/merge-recursive-skip-fix'
Junio C Hamano
1
-0
/
+16
2018-08-13
convert.c: remove an implicit dependency on the_index
Nguyễn Thái Ngọc Duy
1
-1
/
+1
2018-08-02
Merge branch 'en/dirty-merge-fixes'
Junio C Hamano
1
-7
/
+7
2018-08-02
Merge branch 'jm/cache-entry-from-mem-pool'
Junio C Hamano
1
-2
/
+2
2018-08-02
Merge branch 'sb/object-store-lookup'
Junio C Hamano
1
-7
/
+10
2018-07-27
merge-recursive: preserve skip_worktree bit when necessary
Elijah Newren
1
-0
/
+16
2018-07-20
commit.h: remove method declarations
Derrick Stolee
1
-0
/
+1
2018-07-18
Merge branch 'sb/object-store-grafts'
Junio C Hamano
1
-0
/
+1
2018-07-18
Merge branch 'en/merge-recursive-cleanup'
Junio C Hamano
1
-82
/
+104
2018-07-11
merge-recursive: enforce rule that index matches head before merging
Elijah Newren
1
-7
/
+7
2018-07-11
merge-recursive: fix assumption that head tree being merged is HEAD
Elijah Newren
1
-1
/
+1
2018-07-11
merge-recursive: make sure when we say we abort that we actually abort
Elijah Newren
1
-2
/
+2
2018-07-03
index_has_changes(): avoid assuming operating on the_index
Elijah Newren
1
-1
/
+1
2018-07-03
block alloc: add lifecycle APIs for cache_entry structs
Jameson Miller
1
-1
/
+1
2018-07-03
read-cache: teach make_cache_entry to take object_id
Jameson Miller
1
-1
/
+1
2018-07-03
read-cache: teach refresh_cache_entry to take istate
Jameson Miller
1
-1
/
+1
2018-06-29
tag: add repository argument to deref_tag
Stefan Beller
1
-1
/
+2
2018-06-29
commit: add repository argument to lookup_commit_reference
Stefan Beller
1
-3
/
+3
2018-06-29
tree: add repository argument to lookup_tree
Stefan Beller
1
-3
/
+3
2018-06-29
object: add repository argument to parse_object
Stefan Beller
1
-1
/
+3
2018-06-29
Merge branch 'sb/object-store-grafts' into sb/object-store-lookup
Junio C Hamano
1
-0
/
+1
2018-06-25
Merge branch 'sb/object-store-alloc'
Junio C Hamano
1
-1
/
+2
2018-06-25
Merge branch 'nd/commit-util-to-slab'
Junio C Hamano
1
-3
/
+5
2018-06-18
Merge branch 'en/rename-directory-detection'
Junio C Hamano
1
-5
/
+5
2018-06-14
merge-recursive: use xstrdup() instead of fixed buffer
René Scharfe
1
-5
/
+5
2018-06-13
Merge branch 'sb/submodule-merge-in-merge-recursive'
Junio C Hamano
1
-2
/
+2
2018-06-12
merge-recursive: add pointer about unduly complex looking code
Elijah Newren
1
-0
/
+15
2018-06-12
merge-recursive: rename conflict_rename_*() family of functions
Elijah Newren
1
-43
/
+43
2018-06-12
merge-recursive: clarify the rename_dir/RENAME_DIR meaning
Elijah Newren
1
-11
/
+17
2018-06-12
merge-recursive: align labels with their respective code blocks
Elijah Newren
1
-3
/
+3
2018-06-12
merge-recursive: fix numerous argument alignment issues
Elijah Newren
1
-37
/
+38
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
2018-03-14
sha1_file: convert read_sha1_file to struct object_id
brian m. carlson
1
-2
/
+2
2018-03-14
tree-walk: convert tree entry functions to object_id
brian m. carlson
1
-6
/
+6
2018-03-14
strbuf: convert strbuf_add_unique_abbrev to use struct object_id
brian m. carlson
1
-1
/
+1
2018-03-14
tree: convert read_tree_recursive to struct object_id
brian m. carlson
1
-1
/
+1
2018-03-01
write_locked_index(): add flag to avoid writing unchanged index
Martin Ågren
1
-3
/
+2
2018-02-28
merge-recursive: always roll back lock in `merge_recursive_generic()`
Martin Ågren
1
-1
/
+4
2018-02-27
merge-recursive: ensure we write updates for directory-renamed file
Elijah Newren
1
-3
/
+1
2018-02-27
merge-recursive: avoid spurious rename/rename conflict from dir renames
Elijah Newren
1
-2
/
+2
2018-02-27
merge-recursive: fix remaining directory rename + dirty overwrite cases
Elijah Newren
1
-3
/
+22
2018-02-27
merge-recursive: fix overwriting dirty files involved in renames
Elijah Newren
1
-19
/
+66
2018-02-27
merge-recursive: avoid clobbering untracked files with directory renames
Elijah Newren
1
-2
/
+40
2018-02-27
merge-recursive: apply necessary modifications for directory renames
Elijah Newren
1
-1
/
+186
2018-02-15
Merge branch 'jc/merge-symlink-ours-theirs' into maint
Junio C Hamano
1
-4
/
+13
2018-02-15
Merge branch 'po/object-id'
Junio C Hamano
1
-2
/
+3
2018-02-15
Merge branch 'en/merge-recursive-fixes'
Junio C Hamano
1
-1
/
+20
2018-02-14
merge-recursive: when comparing files, don't include trees
Elijah Newren
1
-6
/
+21
2018-02-14
merge-recursive: check for file level conflicts then get new name
Elijah Newren
1
-8
/
+166
2018-02-14
merge-recursive: add computation of collisions due to dir rename & merging
Elijah Newren
1
-3
/
+143
2018-02-14
merge-recursive: check for directory level conflicts
Elijah Newren
1
-0
/
+119
2018-02-14
merge-recursive: add get_directory_renames()
Elijah Newren
1
-3
/
+221
2018-02-14
merge-recursive: make a helper function for cleanup for handle_renames
Elijah Newren
1
-10
/
+13
2018-02-14
merge-recursive: split out code for determining diff_filepairs
Elijah Newren
1
-22
/
+62
2018-02-14
merge-recursive: make !o->detect_rename codepath more obvious
Elijah Newren
1
-2
/
+9
2018-02-14
merge-recursive: fix leaks of allocated renames and diff_filepairs
Elijah Newren
1
-5
/
+15
2018-02-14
merge-recursive: introduce new functions to handle rename logic
Elijah Newren
1
-10
/
+33
2018-02-14
merge-recursive: move the get_renames() function
Elijah Newren
1
-69
/
+70
2018-01-30
sha1_file: convert write_sha1_file to object_id
Patryk Obara
1
-2
/
+3
2018-01-23
Merge branch 'jc/merge-symlink-ours-theirs'
Junio C Hamano
1
-4
/
+13
2018-01-19
merge-recursive: add explanation for src_entry and dst_entry
Elijah Newren
1
-0
/
+19
2018-01-19
merge-recursive: fix logic ordering issue
Elijah Newren
1
-1
/
+1
2018-01-09
Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...
Junio C Hamano
1
-1
/
+1
2018-01-09
merge-recursive: do not look at the index during recursive merge
Junio C Hamano
1
-1
/
+1
2018-01-03
merge: teach -Xours/-Xtheirs to symbolic link merge
Junio C Hamano
1
-4
/
+13
2017-12-22
Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...
Junio C Hamano
1
-0
/
+7
2017-12-22
merge-recursive: avoid incorporating uncommitted changes in a merge
Elijah Newren
1
-0
/
+7
2017-12-19
Merge branch 'en/merge-recursive-icase-removal'
Junio C Hamano
1
-1
/
+1
2017-12-13
Merge branch 'bc/hash-algo'
Junio C Hamano
1
-1
/
+1
2017-11-27
Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way'
Junio C Hamano
1
-2
/
+3
2017-11-27
Merge branch 'jc/ignore-cr-at-eol'
Junio C Hamano
1
-0
/
+2
2017-11-27
merge-recursive: ignore_case shouldn't reject intentional removals
Elijah Newren
1
-1
/
+1
2017-11-15
merge-recursive: handle addition of submodule on our side of history
Elijah Newren
1
-2
/
+3
2017-11-15
Merge branch 'ao/merge-verbosity-getenv-just-once'
Junio C Hamano
1
-3
/
+4
2017-11-13
Switch empty tree and blob lookups to use hash abstraction
brian m. carlson
1
-1
/
+1
2017-11-09
Merge branch 'bw/diff-opt-impl-to-bitfields'
Junio C Hamano
1
-2
/
+2
2017-11-08
diff: --ignore-cr-at-eol
Junio C Hamano
1
-0
/
+2
2017-11-01
diff: make struct diff_flags members lowercase
Brandon Williams
1
-2
/
+2
2017-11-01
diff: remove DIFF_OPT_CLR macro
Brandon Williams
1
-1
/
+1
2017-11-01
diff: remove DIFF_OPT_SET macro
Brandon Williams
1
-1
/
+1
2017-11-01
merge-recursive: check GIT_MERGE_VERBOSITY only once
Andrey Okoshkin
1
-3
/
+4
2017-10-06
treewide: prefer lockfiles on the stack
Martin Ågren
1
-3
/
+3
2017-09-19
Merge branch 'kw/merge-recursive-cleanup'
Junio C Hamano
1
-20
/
+56
2017-09-08
merge-recursive: change current file dir string_lists to hashmap
Kevin Willford
1
-11
/
+45
2017-09-06
merge-recursive: remove return value from get_files_dirs
Kevin Willford
1
-6
/
+2
2017-09-06
merge-recursive: fix memory leak
Kevin Willford
1
-3
/
+9
2017-08-23
treewide: correct several "up-to-date" to "up to date"
Martin Ågren
1
-1
/
+1
2017-07-06
Merge branch 'sb/merge-recursive-code-cleanup'
Junio C Hamano
1
-3
/
+3
2017-06-30
merge-recursive: use DIFF_XDL_SET macro
Stefan Beller
1
-3
/
+3
2017-06-24
Merge branch 'bw/config-h'
Junio C Hamano
1
-0
/
+1
2017-06-24
Merge branch 'bw/ls-files-sans-the-index'
Junio C Hamano
1
-2
/
+2
2017-06-15
config: don't include config.h by default
Brandon Williams
1
-0
/
+1
2017-06-13
convert: convert renormalize_buffer to take an index
Brandon Williams
1
-2
/
+2
2017-06-05
diff-tree: convert diff_tree_sha1 to struct object_id
Brandon Williams
1
-1
/
+1
2017-05-08
object: convert parse_object* to take struct object_id
brian m. carlson
1
-1
/
+1
2017-05-08
Convert lookup_tree to struct object_id
brian m. carlson
1
-3
/
+3
2017-05-08
submodule: convert merge_submodule to use struct object_id
brian m. carlson
1
-4
/
+4
2017-05-02
Convert struct cache_tree to use struct object_id
brian m. carlson
1
-1
/
+1
2017-02-27
Merge branch 'mm/merge-rename-delete-message'
Junio C Hamano
1
-54
/
+63
2017-01-30
use SWAP macro
René Scharfe
1
-4
/
+1
2017-01-30
merge-recursive: make "CONFLICT (rename/delete)" message show both paths
Matt McCutchen
1
-54
/
+63
2017-01-17
Merge branch 'nd/qsort-in-merge-recursive' into maint
Junio C Hamano
1
-9
/
+7
2017-01-17
Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint
Junio C Hamano
1
-0
/
+2
2016-12-19
Merge branch 'jc/lock-report-on-error'
Junio C Hamano
1
-1
/
+1
2016-12-19
Merge branch 'jc/renormalize-merge-kill-safer-crlf'
Junio C Hamano
1
-0
/
+2
2016-12-16
Merge branch 'nd/qsort-in-merge-recursive'
Junio C Hamano
1
-9
/
+7
2016-12-07
hold_locked_index(): align error handling with hold_lockfile_for_update()
Junio C Hamano
1
-1
/
+1
2016-11-28
merge-recursive.c: use string_list_sort instead of qsort
Nguyễn Thái Ngọc Duy
1
-9
/
+7
2016-11-28
merge-recursive: handle NULL in add_cacheinfo() correctly
Johannes Schindelin
1
-0
/
+2
2016-11-17
submodules: allow empty working-tree dirs in merge/cherry-pick
David Turner
1
-6
/
+15
2016-10-17
Merge branch 'rs/cocci'
Junio C Hamano
1
-3
/
+3
2016-10-10
use strbuf_add_unique_abbrev() for adding short hashes, part 3
René Scharfe
1
-3
/
+3
2016-09-26
Merge branch 'rs/cocci'
Junio C Hamano
1
-1
/
+1
2016-09-15
use strbuf_addstr() for adding constant strings to a strbuf, part 2
René Scharfe
1
-1
/
+1
2016-09-07
Convert read_mmblob to take struct object_id.
brian m. carlson
1
-3
/
+3
2016-09-07
cache: convert struct cache_entry to use struct object_id
brian m. carlson
1
-1
/
+1
2016-08-19
Merge branch 'rs/pull-signed-tag'
Junio C Hamano
1
-4
/
+1
2016-08-13
merge-recursive: fix verbose output for multiple base trees
René Scharfe
1
-4
/
+1
2016-08-12
Merge branch 'rs/merge-recursive-string-list-init'
Junio C Hamano
1
-2
/
+1
2016-08-05
merge-recursive: use STRING_LIST_INIT_NODUP
René Scharfe
1
-2
/
+1
2016-08-01
merge-recursive: flush output buffer even when erroring out
Johannes Schindelin
1
-1
/
+3
2016-08-01
merge_trees(): ensure that the callers release output buffer
Johannes Schindelin
1
-0
/
+2
2016-08-01
merge-recursive: offer an option to retain the output in 'obuf'
Johannes Schindelin
1
-4
/
+13
2016-08-01
merge-recursive: write the commit title in one go
Johannes Schindelin
1
-8
/
+9
2016-08-01
merge-recursive: flush output buffer before printing error messages
Johannes Schindelin
1
-48
/
+68
2016-07-26
merge-recursive: switch to returning errors instead of dying
Johannes Schindelin
1
-27
/
+35
2016-07-26
merge-recursive: handle return values indicating errors
Johannes Schindelin
1
-102
/
+150
2016-07-26
merge-recursive: allow write_tree_from_memory() to error out
Johannes Schindelin
1
-2
/
+2
2016-07-26
merge-recursive: avoid returning a wholesale struct
Johannes Schindelin
1
-50
/
+56
2016-07-26
merge_recursive: abort properly upon errors
Johannes Schindelin
1
-5
/
+12
2016-07-26
merge-recursive: clarify code in was_tracked()
Johannes Schindelin
1
-16
/
+14
2016-07-26
die(_("BUG")): avoid translating bug messages
Johannes Schindelin
1
-3
/
+3
2016-07-26
die("bug"): report bugs consistently
Johannes Schindelin
1
-8
/
+7
2016-07-25
Merge branch 'jc/renormalize-merge-kill-safer-crlf'
Junio C Hamano
1
-4
/
+13
2016-07-12
merge: avoid "safer crlf" during recording of merge results
Junio C Hamano
1
-4
/
+13
2016-06-28
merge-recursive: convert merge_recursive_generic() to object_id
brian m. carlson
1
-7
/
+7
2016-06-28
merge-recursive: convert leaf functions to use struct object_id
brian m. carlson
1
-118
/
+118
2016-06-28
merge-recursive: convert struct merge_file_info to object_id
brian m. carlson
1
-19
/
+20
2016-06-28
merge-recursive: convert struct stage_data to use object_id
brian m. carlson
1
-20
/
+18
2016-06-28
diff: convert struct diff_filespec to struct object_id
brian m. carlson
1
-49
/
+58
2016-05-06
Merge branch 'bc/object-id'
Junio C Hamano
1
-2
/
+2
2016-04-19
match-trees: convert shift_tree() and shift_tree_by() to use object_id
brian m. carlson
1
-2
/
+2
2016-04-12
merge-recursive: do not check working copy when creating a virtual merge base
Elijah Newren
1
-3
/
+3
2016-04-12
merge-recursive: remove duplicate code
Elijah Newren
1
-2
/
+0
2016-02-24
merge-recursive: find-renames resets threshold
Felipe Gonçalves Assis
1
-1
/
+3
2016-02-17
merge-recursive: more consistent interface
Felipe Gonçalves Assis
1
-1
/
+4
2016-02-17
merge-recursive: option to disable renames
Felipe Gonçalves Assis
1
-0
/
+7
2015-11-20
Remove get_object_hash.
brian m. carlson
1
-8
/
+8
[prev]
[next]