| 2019-04-26 | Honor core.precomposeUnicode in more places Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2019-04-08 | merge-recursive: switch directory rename detection... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2019-04-08 | merge-recursive: give callers of handle_content_merge... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2019-04-08 | merge-recursive: track information associated with... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2019-04-08 | t6043: fix copied test description to match its purpose Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2019-04-08 | merge-recursive: switch from (oid,mode) pairs to a... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2019-04-08 | merge-recursive: cleanup handle_rename_* function signatures Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2019-04-08 | merge-recursive: track branch where rename occurred... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2019-04-08 | merge-recursive: remove ren[12]_other fields from rename_con... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2019-04-08 | merge-recursive: shrink rename_conflict_info Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2019-04-08 | merge-recursive: move some struct declarations together Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2019-04-08 | merge-recursive: use 'ci' for rename_conflict_info... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2019-04-08 | merge-recursive: rename locals 'o' and 'a' to 'obuf... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2019-04-08 | merge-recursive: rename diff_filespec 'one' to 'o' Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2019-04-08 | merge-recursive: rename merge_options argument from... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2019-04-08 | Use 'unsigned short' for mode, like diff_filespec does Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2019-04-01 | fast-import: fix erroneous handling of get-mark with... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2019-04-01 | fast-import: only allow cat-blob requests where it... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2019-04-01 | fast-import: check most prominent commands first Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2019-04-01 | git-fast-import.txt: fix wording about where ls command... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2019-04-01 | t9300: demonstrate bug with get-mark and empty orphan... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2019-02-21 | merge-options.txt: correct wording of --no-commit option Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2019-02-14 | git-rebase.txt: update to reflect merge now implemented... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2019-02-08 | log,diff-tree: add --combined-all-paths option Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2019-01-10 | git-show-ref.txt: fix order of flags Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2019-01-07 | rebase: implement --merge via the interactive machinery Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-12-28 | rebase: define linearization ordering and enforce it Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-12-28 | git-legacy-rebase: simplify unnecessary triply-nested if Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-12-28 | git-rebase, sequencer: extend --quiet option for the... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-12-28 | am, rebase--merge: do not overlook --skip'ed commits... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-12-28 | t5407: add a test demonstrating how interactive handles... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-12-28 | rebase: fix incompatible options error message Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-12-28 | rebase: make builtin and legacy script error messages... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-12-09 | git-rebase.txt: update note about directory rename... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-11-17 | fast-export: add a --show-original-ids option to show... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-11-17 | fast-import: remove unmaintained duplicate documentation Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-11-17 | fast-export: add --reference-excluded-parents option Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-11-17 | fast-export: ensure we export requested refs Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-11-17 | fast-export: when using paths, avoid corrupt stream... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-11-17 | fast-export: move commit rewriting logic into a function... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-11-17 | fast-export: avoid dying when filtering by paths and... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-11-17 | fast-export: use value from correct enum Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-11-17 | git-fast-export.txt: clarify misleading documentation... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-11-17 | git-fast-import.txt: fix documentation for --quiet... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-11-17 | fast-export: convert sha1 to oid Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-11-08 | t6036, t6043: increase code coverage for file collision... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-11-08 | merge-recursive: improve rename/rename(1to2)/add[/add... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-11-08 | merge-recursive: use handle_file_collision for add... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-11-08 | merge-recursive: improve handling for rename/rename... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-11-08 | merge-recursive: fix rename/add conflict handling Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-11-08 | merge-recursive: new function for better colliding... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-11-08 | merge-recursive: increase marker length with depth... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-11-08 | t6036, t6042: testcases for rename collision of already... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-11-08 | t6042: add tests for consistency in file collision... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-10-22 | fsck: move fsck_head_link() to get_default_heads()... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-10-18 | merge-recursive: avoid showing conflicts with merge... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-10-18 | merge-recursive: improve auto-merging messages with... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-09-27 | commit: fix erroneous BUG, 'multiple renames on the... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-09-20 | merge-recursive: rename merge_file_1() and merge_content() Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-09-20 | merge-recursive: remove final remaining caller of merge_file... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-09-20 | merge-recursive: avoid wrapper function when unnecessary... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-09-20 | merge-recursive: set paths correctly when three-way... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-09-13 | sequencer: fix --allow-empty-message behavior, make... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-09-12 | update-ref: allow --no-deref with --stdin Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-09-12 | update-ref: fix type of update_flags variable to match... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-09-11 | rerere: avoid buffer overrun Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-09-11 | t4200: demonstrate rerere segfault on specially crafted... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-09-05 | Remove superfluous trailing semicolons Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-08-30 | am: avoid directory rename detection when calling recursive... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-08-30 | merge-recursive: add ability to turn off directory... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-08-30 | t3401: add another directory rename testcase for rebase... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-08-15 | Remove forward declaration of an enum Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-08-15 | compat/precompose_utf8.h: use more common include guard... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-08-15 | urlmatch.h: fix include guard Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-08-15 | Move definition of enum branch_track from cache.h to... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-08-15 | alloc: make allocate_alloc_state and clear_alloc_state... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-08-15 | Add missing includes and forward declarations Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-08-08 | git-update-index.txt: reword possibly confusing example Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-08-08 | t7406: avoid using test_must_fail for commands other... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-08-08 | t7406: prefer test_* helper functions to test -[feds] Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-08-08 | t7406: avoid having git commands upstream of a pipe Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-08-08 | t7406: simplify by using diff --name-only instead of... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-08-08 | t7406: fix call that was failing for the wrong reason Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-08-06 | t3031: update test description to mention desired behavior Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-31 | read-cache: fix directory/file conflict handling in... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-31 | t1015: demonstrate directory/file conflict recovery... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-27 | merge-recursive: preserve skip_worktree bit when necessary Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-11 | t7405: verify 'merge --abort' works after submodule... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-11 | t7405: add a directory/submodule conflict Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-11 | t7405: add a file/submodule conflict Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-11 | merge: fix misleading pre-merge check documentation Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-11 | merge-recursive: enforce rule that index matches head... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-11 | t6044: add more testcases with staged changes before... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-11 | merge-recursive: fix assumption that head tree being... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-11 | merge-recursive: make sure when we say we abort that... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-11 | t6044: add a testcase for index matching head, when... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-11 | t6036: add a failed conflict detection case: regular... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-06 | t6036: add lots of detail for directory/file conflicts... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-03 | t6042: add testcase covering long chains of rename... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |
| 2018-07-03 | t6042: add testcase covering rename/rename(2to1)/delete... Signed-off-by: Elijah Newren <newren@gmail.com> |
diff | tree |