| 2019-10-23 |
 Elijah Newren | merge-recursive: fix merging a subdirectory into the...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-10-23 |
Elijah Newren | merge-recursive: clean up get_renamed_dir_portion()
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-10-02 |
Elijah Newren | dir: special case check for the possibility that pathspec...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-09-17 |
Elijah Newren | clean: fix theoretical path corruption
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-09-17 |
Elijah Newren | clean: rewrap overly long line
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-09-17 |
Elijah Newren | clean: avoid removing untracked files in a nested git...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-09-17 |
Elijah Newren | clean: disambiguate the definition of -d
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-09-17 |
Elijah Newren | git-clean.txt: do not claim we will delete files with...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-09-17 |
Elijah Newren | dir: add commentary explaining match_pathspec_item...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-09-17 |
Elijah Newren | dir: if our pathspec might match files under a dir...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-09-17 |
Elijah Newren | dir: make the DO_MATCH_SUBMODULE code reusable for...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-09-17 |
Elijah Newren | dir: also check directories for matching pathspecs
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-09-17 |
Elijah Newren | dir: fix off-by-one error in match_pathspec_item
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-09-17 |
Elijah Newren | dir: fix typo in comment
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-09-17 |
Elijah Newren | t7300: add testcases showing failure to clean specified...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-09-05 |
Elijah Newren | t9902: use a non-deprecated command for testing
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-09-05 |
Elijah Newren | Recommend git-filter-repo instead of git-filter-branch
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-09-05 |
Elijah Newren | t6006: simplify, fix, and optimize empty message test
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-09-05 |
Elijah Newren | t3427: accelerate this test by using fast-export and...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-09-01 |
Elijah Newren | merge-options.txt: clarify meaning of various ff-related...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-08-16 |
Elijah Newren | checkout: remove duplicate code
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-08-12 |
Elijah Newren | git-fast-import.txt: clarify that multiple merge commits...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-08-06 |
Elijah Newren | merge-recursive: avoid directory rename detection in...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-06-05 |
Elijah Newren | merge-recursive: restore accidentally dropped setting...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-05-14 |
Elijah Newren | fast-export: do automatic reencoding of commit messages...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-05-14 |
Elijah Newren | fast-export: differentiate between explicitly UTF-8...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-05-14 |
Elijah Newren | fast-export: avoid stripping encoding header if we...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-05-14 |
Elijah Newren | fast-import: support 'encoding' commit header
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-05-14 |
Elijah Newren | t9350: fix encoding test to actually test reencoding
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-04-26 |
Elijah Newren | Honor core.precomposeUnicode in more places
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-04-08 |
Elijah Newren | merge-recursive: switch directory rename detection...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-04-08 |
Elijah Newren | merge-recursive: give callers of handle_content_merge...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-04-08 |
Elijah Newren | merge-recursive: track information associated with...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-04-08 |
Elijah Newren | t6043: fix copied test description to match its purpose
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-04-08 |
Elijah Newren | merge-recursive: switch from (oid,mode) pairs to a...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-04-08 |
Elijah Newren | merge-recursive: cleanup handle_rename_* function signatures
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-04-08 |
Elijah Newren | merge-recursive: track branch where rename occurred...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-04-08 |
Elijah Newren | merge-recursive: remove ren[12]_other fields from rename_con...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-04-08 |
Elijah Newren | merge-recursive: shrink rename_conflict_info
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-04-08 |
Elijah Newren | merge-recursive: move some struct declarations together
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-04-08 |
Elijah Newren | merge-recursive: use 'ci' for rename_conflict_info...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-04-08 |
Elijah Newren | merge-recursive: rename locals 'o' and 'a' to 'obuf...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-04-08 |
Elijah Newren | merge-recursive: rename diff_filespec 'one' to 'o'
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-04-08 |
Elijah Newren | merge-recursive: rename merge_options argument from...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-04-08 |
Elijah Newren | Use 'unsigned short' for mode, like diff_filespec does
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-04-01 |
Elijah Newren | fast-import: fix erroneous handling of get-mark with...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-04-01 |
Elijah Newren | fast-import: only allow cat-blob requests where it...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-04-01 |
Elijah Newren | fast-import: check most prominent commands first
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-04-01 |
Elijah Newren | git-fast-import.txt: fix wording about where ls command...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-04-01 |
Elijah Newren | t9300: demonstrate bug with get-mark and empty orphan...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-02-21 |
Elijah Newren | merge-options.txt: correct wording of --no-commit option
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-02-14 |
Elijah Newren | git-rebase.txt: update to reflect merge now implemented...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-02-08 |
Elijah Newren | log,diff-tree: add --combined-all-paths option
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-01-10 |
Elijah Newren | git-show-ref.txt: fix order of flags
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2019-01-07 |
Elijah Newren | rebase: implement --merge via the interactive machinery
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-12-28 |
Elijah Newren | rebase: define linearization ordering and enforce it
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-12-28 |
Elijah Newren | git-legacy-rebase: simplify unnecessary triply-nested if
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-12-28 |
Elijah Newren | git-rebase, sequencer: extend --quiet option for the...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-12-28 |
Elijah Newren | am, rebase--merge: do not overlook --skip'ed commits...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-12-28 |
Elijah Newren | t5407: add a test demonstrating how interactive handles...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-12-28 |
Elijah Newren | rebase: fix incompatible options error message
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-12-28 |
Elijah Newren | rebase: make builtin and legacy script error messages...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-12-09 |
Elijah Newren | git-rebase.txt: update note about directory rename...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-11-17 |
Elijah Newren | fast-export: add a --show-original-ids option to show...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-11-17 |
Elijah Newren | fast-import: remove unmaintained duplicate documentation
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-11-17 |
Elijah Newren | fast-export: add --reference-excluded-parents option
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-11-17 |
Elijah Newren | fast-export: ensure we export requested refs
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-11-17 |
Elijah Newren | fast-export: when using paths, avoid corrupt stream...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-11-17 |
Elijah Newren | fast-export: move commit rewriting logic into a function...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-11-17 |
Elijah Newren | fast-export: avoid dying when filtering by paths and...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-11-17 |
Elijah Newren | fast-export: use value from correct enum
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-11-17 |
Elijah Newren | git-fast-export.txt: clarify misleading documentation...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-11-17 |
Elijah Newren | git-fast-import.txt: fix documentation for --quiet...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-11-17 |
Elijah Newren | fast-export: convert sha1 to oid
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-11-08 |
Elijah Newren | t6036, t6043: increase code coverage for file collision...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-11-08 |
Elijah Newren | merge-recursive: improve rename/rename(1to2)/add[/add...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-11-08 |
Elijah Newren | merge-recursive: use handle_file_collision for add...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-11-08 |
Elijah Newren | merge-recursive: improve handling for rename/rename...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-11-08 |
Elijah Newren | merge-recursive: fix rename/add conflict handling
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-11-08 |
Elijah Newren | merge-recursive: new function for better colliding...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-11-08 |
Elijah Newren | merge-recursive: increase marker length with depth...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-11-08 |
Elijah Newren | t6036, t6042: testcases for rename collision of already...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-11-08 |
Elijah Newren | t6042: add tests for consistency in file collision...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-10-22 |
Elijah Newren | fsck: move fsck_head_link() to get_default_heads()...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-10-18 |
Elijah Newren | merge-recursive: avoid showing conflicts with merge...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-10-18 |
Elijah Newren | merge-recursive: improve auto-merging messages with...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-09-27 |
Elijah Newren | commit: fix erroneous BUG, 'multiple renames on the...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-09-20 |
Elijah Newren | merge-recursive: rename merge_file_1() and merge_content()
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-09-20 |
Elijah Newren | merge-recursive: remove final remaining caller of merge_file...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-09-20 |
Elijah Newren | merge-recursive: avoid wrapper function when unnecessary...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-09-20 |
Elijah Newren | merge-recursive: set paths correctly when three-way...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-09-13 |
Elijah Newren | sequencer: fix --allow-empty-message behavior, make...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-09-12 |
Elijah Newren | update-ref: allow --no-deref with --stdin
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-09-12 |
Elijah Newren | update-ref: fix type of update_flags variable to match...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-09-11 |
Elijah Newren | rerere: avoid buffer overrun
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-09-11 |
Elijah Newren | t4200: demonstrate rerere segfault on specially crafted...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-09-05 |
Elijah Newren | Remove superfluous trailing semicolons
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-08-30 |
Elijah Newren | am: avoid directory rename detection when calling recursive...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-08-30 |
Elijah Newren | merge-recursive: add ability to turn off directory...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| 2018-08-30 |
Elijah Newren | t3401: add another directory rename testcase for rebase...
Signed-off-by: Elijah Newren <newren@gmail.com>
|
commit | commitdiff | tree |
| next |
projects / thirdparty / git.git / search
Elijah Newren