]> git.ipfire.org Git - thirdparty/git.git/search
projects / thirdparty / git.git / search
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
merge-recursive: move more is_dirty handling to merge_content
2018-05-08  Elijah Newrenmerge-recursive: move more is_dirty handling to merge_content
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-05-08  Elijah Newrenmerge-recursive: improve add_cacheinfo error handling
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-05-08  Elijah Newrenmerge-recursive: avoid spurious rename/rename conflict...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-05-08  Elijah Newrendirectory rename detection: new testcases showcasing...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-05-08  Elijah Newrenmerge-recursive: fix remaining directory rename + dirty...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-05-08  Elijah Newrenmerge-recursive: fix overwriting dirty files involved...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-05-08  Elijah Newrenmerge-recursive: avoid clobbering untracked files with...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-05-08  Elijah Newrenmerge-recursive: apply necessary modifications for...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-05-08  Elijah Newrenmerge-recursive: when comparing files, don't include...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-05-08  Elijah Newrenmerge-recursive: check for file level conflicts then...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-05-08  Elijah Newrenmerge-recursive: add computation of collisions due...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-05-08  Elijah Newrenmerge-recursive: check for directory level conflicts
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-05-08  Elijah Newrenmerge-recursive: add get_directory_renames()
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-04-20  Elijah Newrenmerge-recursive: make a helper function for cleanup...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-04-20  Elijah Newrenmerge-recursive: split out code for determining diff_filepairs
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-04-20  Elijah Newrenmerge-recursive: make !o->detect_rename codepath more...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-04-20  Elijah Newrenmerge-recursive: fix leaks of allocated renames and...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-04-20  Elijah Newrenmerge-recursive: introduce new functions to handle...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-04-20  Elijah Newrenmerge-recursive: move the get_renames() function
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-04-20  Elijah Newrendirectory rename detection: tests for handling overwriting...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-04-20  Elijah Newrendirectory rename detection: tests for handling overwriting...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-04-20  Elijah Newrendirectory rename detection: miscellaneous testcases...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-04-20  Elijah Newrendirectory rename detection: testcases exploring possibly...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-04-20  Elijah Newrendirectory rename detection: more involved edge/corner...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-04-20  Elijah Newrendirectory rename detection: testcases checking which...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-04-20  Elijah Newrendirectory rename detection: files/directories in the...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-04-20  Elijah Newrendirectory rename detection: partially renamed directory...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-04-20  Elijah Newrendirectory rename detection: testcases to avoid taking...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-04-20  Elijah Newrendirectory rename detection: directory splitting testcases
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-04-20  Elijah Newrendirectory rename detection: basic testcases
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-27  Elijah Newrenmerge-recursive: ensure we write updates for directory...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-27  Elijah Newrenmerge-recursive: avoid spurious rename/rename conflict...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-27  Elijah Newrendirectory rename detection: new testcases showcasing...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-27  Elijah Newrenmerge-recursive: fix remaining directory rename + dirty...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-27  Elijah Newrenmerge-recursive: fix overwriting dirty files involved...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-27  Elijah Newrenmerge-recursive: avoid clobbering untracked files with...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-27  Elijah Newrenmerge-recursive: apply necessary modifications for...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-14  Elijah Newrenmerge-recursive: when comparing files, don't include...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-14  Elijah Newrenmerge-recursive: check for file level conflicts then...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-14  Elijah Newrenmerge-recursive: add computation of collisions due...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-14  Elijah Newrenmerge-recursive: check for directory level conflicts
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-14  Elijah Newrenmerge-recursive: add get_directory_renames()
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-14  Elijah Newrenmerge-recursive: make a helper function for cleanup...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-14  Elijah Newrenmerge-recursive: split out code for determining diff_filepairs
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-14  Elijah Newrenmerge-recursive: make !o->detect_rename codepath more...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-14  Elijah Newrenmerge-recursive: fix leaks of allocated renames and...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-14  Elijah Newrenmerge-recursive: introduce new functions to handle...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-14  Elijah Newrenmerge-recursive: move the get_renames() function
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-14  Elijah Newrendirectory rename detection: tests for handling overwriting...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-14  Elijah Newrendirectory rename detection: tests for handling overwriting...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-14  Elijah Newrendirectory rename detection: miscellaneous testcases...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-14  Elijah Newrendirectory rename detection: testcases exploring possibly...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-14  Elijah Newrendirectory rename detection: more involved edge/corner...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-14  Elijah Newrendirectory rename detection: testcases checking which...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-14  Elijah Newrendirectory rename detection: files/directories in the...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-14  Elijah Newrendirectory rename detection: partially renamed directory...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-14  Elijah Newrendirectory rename detection: testcases to avoid taking...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-14  Elijah Newrendirectory rename detection: directory splitting testcases
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-02-14  Elijah Newrendirectory rename detection: basic testcases
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-01-19  Elijah Newrenmerge-recursive: add explanation for src_entry and...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-01-19  Elijah Newrenmerge-recursive: fix logic ordering issue
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-01-19  Elijah NewrenTighten and correct a few testcases for merging and...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2017-12-22  Elijah Newrenmerge-recursive: avoid incorporating uncommitted changes...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2017-12-22  Elijah Newrenmove index_has_changes() from builtin/am.c to merge...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2017-12-22  Elijah Newrent6044: recursive can silently incorporate dirty changes...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2017-12-05  Elijah Newrenstrbuf: remove unused stripspace function alias
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2017-11-27  Elijah Newrenmerge-recursive: ignore_case shouldn't reject intentional...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2017-11-15  Elijah Newrensequencer: show rename progress during cherry picks
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2017-11-15  Elijah Newrendiff: remove silent clamp of renameLimit
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2017-11-15  Elijah Newrenprogress: fix progress meters when dealing with lots...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2017-11-15  Elijah Newrenmerge-recursive: handle addition of submodule on our...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2017-11-14  Elijah Newrensequencer: warn when internal merge may be suboptimal...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2016-04-13  Elijah Newrent6044: new merge testcases for when index doesn't match...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2016-04-13  Elijah Newrenmerge-octopus: abort if index does not match HEAD
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2016-04-13  Elijah Newrenbuiltin/merge.c: fix a bug with trivial merges
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2016-04-13  Elijah Newrent7605: add a testcase demonstrating a bug with trivial...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2016-04-13  Elijah Newrenmerge-recursive: do not check working copy when creating...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2016-04-13  Elijah Newrenmerge-recursive: remove duplicate code
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2011-08-14  Elijah Newrenmerge-recursive: Don't re-sort a list whose order we...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2011-08-14  Elijah Newrenmerge-recursive: Fix virtual merge base for rename...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2011-08-14  Elijah Newrent6036: criss-cross + rename/rename(1to2)/add-dest ...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2011-08-14  Elijah Newrenmerge-recursive: Avoid unnecessary file rewrites
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2011-08-14  Elijah Newrent6022: Additional tests checking for unnecessary updates...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2011-08-14  Elijah Newrenmerge-recursive: Fix spurious 'refusing to lose untracked...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2011-08-14  Elijah Newrent6022: Add testcase for spurious "refusing to lose...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2011-08-14  Elijah Newrenmerge-recursive: Fix working copy handling for rename...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2011-08-14  Elijah Newrenmerge-recursive: add handling for rename/rename/add...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2011-08-14  Elijah Newrenmerge-recursive: Have conflict_rename_delete reuse...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2011-08-14  Elijah Newrenmerge-recursive: Make modify/delete handling code reusable
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2011-08-14  Elijah Newrenmerge-recursive: Consider modifications in rename/rename...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2011-08-14  Elijah Newrenmerge-recursive: Create function for merging with branchname...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2011-08-14  Elijah Newrenmerge-recursive: Record more data needed for merging...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2011-08-14  Elijah Newrenmerge-recursive: Defer rename/rename(2to1) handling...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2011-08-14  Elijah Newrenmerge-recursive: Small cleanups for conflict_rename_rename_1to2
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2011-08-14  Elijah Newrenmerge-recursive: Fix rename/rename(1to2) resolution...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2011-08-14  Elijah Newrenmerge-recursive: Introduce a merge_file convenience...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2011-08-14  Elijah Newrenmerge-recursive: Fix modify/delete resolution in the...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2011-08-14  Elijah Newrenmerge-recursive: When we detect we can skip an update...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2011-08-14  Elijah Newrenmerge-recursive: Provide more info in conflict markers...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2011-08-14  Elijah Newrenmerge-recursive: Cleanup and consolidation of rename_conflic...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
next
Unnamed repository; edit this file 'description' to name the repository.