/ uis / git / x / uis / git / git.git / search
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Add missing includes and forward declarations
2018-08-15 Elijah NewrenAdd missing includes and forward declarations
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-07-11 Elijah Newrent7405: verify 'merge --abort' works after submodule...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-07-11 Elijah Newrent7405: add a directory/submodule conflict
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-07-11 Elijah Newrent7405: add a file/submodule conflict
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-07-11 Elijah Newrenmerge: fix misleading pre-merge check documentation
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-07-11 Elijah Newrenmerge-recursive: enforce rule that index matches head...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-07-11 Elijah Newrent6044: add more testcases with staged changes before...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-07-11 Elijah Newrenmerge-recursive: fix assumption that head tree being...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-07-11 Elijah Newrenmerge-recursive: make sure when we say we abort that...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-07-11 Elijah Newrent6044: add a testcase for index matching head, when...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-07-11 Elijah Newrent6036: add a failed conflict detection case: regular...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-07-06 Elijah Newrent6036: add lots of detail for directory/file conflicts...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-07-03 Elijah Newrent6042: add testcase covering long chains of rename...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-07-03 Elijah Newrent6042: add testcase covering rename/rename(2to1)/delete...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-07-03 Elijah Newrent6042: add testcase covering rename/add/delete conflict...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-07-03 Elijah Newrent6036: add a failed conflict detection case with conflicting...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-07-03 Elijah Newrent6036: add a failed conflict detection case with submodule...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-07-03 Elijah Newrent6036: add a failed conflict detection case with submodule...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-07-03 Elijah Newrent6036: add a failed conflict detection case with symlink...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-07-03 Elijah Newrent6036: add a failed conflict detection case with symlink...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-07-03 Elijah Newrent6044: verify that merges expected to abort actually...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-07-03 Elijah Newrenindex_has_changes(): avoid assuming operating on the_index
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-07-03 Elijah Newrenread-cache.c: move index_has_changes() from merge.c
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-06-28 Elijah Newrent5407: fix test to cover intended arguments
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-06-28 Elijah Newrenapply: fix grammar error in comment
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-06-27 Elijah Newrengit-rebase--merge: modernize "git-$cmd" to "git $cmd"
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-06-27 Elijah NewrenFix use of strategy options with interactive rebases
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-06-27 Elijah Newrent3418: add testcase showing problems with rebase -i...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-06-27 Elijah Newrengit-rebase: make --allow-empty-message the default
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-06-27 Elijah Newrent3401: add directory rename testcases for rebase and am
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-06-27 Elijah Newrengit-rebase.txt: document behavioral differences between...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-06-27 Elijah Newrendirectory-rename-detection.txt: technical docs on abilities...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-06-27 Elijah Newrengit-rebase.txt: address confusion between --no-ff vs...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-06-27 Elijah Newrengit-rebase: error out when incompatible options passed
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-06-27 Elijah Newrent3422: new testcases for checking when incompatible...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-06-26 Elijah Newrengit-rebase.sh: update help messages a bit
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-06-26 Elijah Newrengit-rebase.txt: document incompatible options
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-06-13 Elijah NewrenRelNotes 2.18: clarify where directory rename detection...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-06-12 Elijah Newrenmerge-recursive: add pointer about unduly complex looking...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-06-12 Elijah Newrenmerge-recursive: rename conflict_rename_*() family...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-06-12 Elijah Newrenmerge-recursive: clarify the rename_dir/RENAME_DIR...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-06-12 Elijah Newrenmerge-recursive: align labels with their respective...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-06-12 Elijah Newrenmerge-recursive: fix numerous argument alignment issues
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-06-12 Elijah Newrenmerge-recursive: fix miscellaneous grammar error in...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-06-01 Elijah NewrenRelNotes: remove duplicate release note
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-05-28 Elijah Newrent6036: prefer test_when_finished to manual cleanup...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-05-28 Elijah Newrent6036, t6042: prefer test_cmp to sequences of test
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-05-28 Elijah Newrent6036, t6042: prefer test_path_is_file, test_path_is_missing
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-05-28 Elijah Newrent6036, t6042: use test_line_count instead of wc -l
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-05-28 Elijah Newrent6036, t6042: use test_create_repo to keep tests independent
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-05-25 Elijah Newrenrev-parse: check lookup'ed commit references for NULL
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-05-20 Elijah Newrenmerge-recursive: provide pair of `unpack_trees_{start...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-05-08 Elijah Newrenmerge-recursive: fix check for skipability of working...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-05-08 Elijah Newrenmerge-recursive: make "Auto-merging" comment show for...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-05-08 Elijah Newrenmerge-recursive: fix remainder of was_dirty() to use...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-05-08 Elijah Newrenmerge-recursive: fix was_tracked() to quit lying with...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-05-08 Elijah Newrent6046: testcases checking whether updates can be skipped...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-05-08 Elijah Newrenmerge-recursive: avoid triggering add_cacheinfo error...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
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-05-02 Elijah Newrenunpack_trees: fix breakage when o->src_index != o-...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-04-25 Elijah NewrenMake running git under other debugger-like programs...
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-04-09 Elijah NewrenDocumentation: normalize spelling of 'normalised'
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2018-04-09 Elijah NewrenDocumentation: fix several one-character-off spelling...
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
next
Local mirror of git