Public Git Hosting - git.git/search

2021-01-04	Elijah Newren	merge-ort: copy and adapt merge_3way() from merge-recursive.c Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-01-04	Elijah Newren	merge-ort: flesh out implementation of handle_content_merge() Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-01-04	Elijah Newren	merge-ort: handle book-keeping around two- and three... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-01-04	Elijah Newren	merge-ort: implement unique_path() helper Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-01-04	Elijah Newren	merge-ort: handle directory/file conflicts that remain Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-01-04	Elijah Newren	merge-ort: handle D/F conflict where directory disappears... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: add modify/delete handling and delayed output... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: add die-not-implemented stub handle_content_merge... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: add function grouping comments Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: add a paths_to_free field to merge_options_internal Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: add a path_conflict field to merge_options_internal Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: add a clear_internal_opts helper Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: add a few includes Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: free data structures in merge_finalize() Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: add implementation of record_conflicted_index_ent... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	tree: enable cmp_cache_name_compare() to be used elsewhere Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: add implementation of checkout() Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: basic outline for merge_switch_to_result() Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: step 3 of tree writing -- handling subdirectories... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: step 2 of tree writing -- function to create... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: step 1 of tree writing -- record basenames... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: have process_entries operate in a defined... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: add a preliminary simple process_entries... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: avoid recursing into identical trees Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: record stage and auxiliary info for every... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: compute a few more useful fields for collect_merg... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: avoid repeating fill_tree_descriptor() on... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: implement a very basic collect_merge_info() Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: add an err() function similar to one from... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: use histogram diff Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: port merge_start() from merge-recursive Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: add some high-level algorithm structure Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-12-13	Elijah Newren	merge-ort: setup basic internal data structures Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-11-11	Elijah Newren	shortlog: use strset from strmap.h Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-11-11	Elijah Newren	Use new HASHMAP_INIT macro to simplify hashmap initialization Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-11-11	Elijah Newren	strmap: take advantage of FLEXPTR_ALLOC_STR when relevant Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-11-11	Elijah Newren	strmap: enable allocations to come from a mem_pool Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-11-06	Elijah Newren	strmap: add a strset sub-type Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-11-06	Elijah Newren	strmap: split create_entry() out of strmap_put() Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-11-05	Elijah Newren	strmap: add functions facilitating use as a string... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-11-05	Elijah Newren	strmap: enable faster clearing and reusing of strmaps Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-11-05	Elijah Newren	strmap: add more utility functions Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-11-03	Elijah Newren	merge,rebase,revert: select ort or recursive by config... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-11-02	Elijah Newren	strmap: new utility functions Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-11-02	Elijah Newren	hashmap: provide deallocation function names Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-11-02	Elijah Newren	hashmap: introduce a new hashmap_partial_clear() Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-11-02	Elijah Newren	hashmap: allow re-use after hashmap_free() Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-11-02	Elijah Newren	hashmap: adjust spacing to fix argument alignment Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-10-29	Elijah Newren	fast-rebase: demonstrate merge-ort's API via new test... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-10-27	Elijah Newren	merge-ort-wrappers: new convience wrappers to mimic... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-10-27	Elijah Newren	merge-ort: barebones API of new merge strategy with... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-10-13	Elijah Newren	hashmap: add usage documentation explaining hashmap_free... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-08-19	Elijah Newren	dir: fix problematic API to avoid memory leaks Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-08-19	Elijah Newren	dir: make clear_directory() free all relevant memory Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-08-18	Elijah Newren	mem-pool: use consistent pool variable name Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-08-18	Elijah Newren	mem-pool: use more standard initialization and finalization Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-08-18	Elijah Newren	mem-pool: add convenience functions for strdup and... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-08-14	Elijah Newren	sequencer: avoid garbled merge machinery messages due... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-08-12	Elijah Newren	dir: avoid prematurely marking nonbare repositories... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-08-12	Elijah Newren	t3000: fix some test description typos Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-08-10	Elijah Newren	t6425: be more flexible with rename/delete conflict... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-08-10	Elijah Newren	t642[23]: be more flexible for add/add conflicts involving... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-08-10	Elijah Newren	t6422, t6426: be more flexible for add/add conflicts... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-08-10	Elijah Newren	t6423: add an explanation about why one of the tests... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-08-10	Elijah Newren	t6416, t6423: clarify some comments and fix some typos Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-08-10	Elijah Newren	t6422: fix multiple errors with the mod6 test expectations Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-08-10	Elijah Newren	t6423: fix test setup for a couple tests Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-08-10	Elijah Newren	t6416, t6422: fix incorrect untracked file count Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-08-10	Elijah Newren	t6422: fix bad check against missing file Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-08-10	Elijah Newren	t6418: tighten delete/normalize conflict testcase Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-08-10	Elijah Newren	Collect merge-related tests to t64xx Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-08-03	Elijah Newren	checkout: support renormalization with checkout -m... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-08-03	Elijah Newren	merge: make merge.renormalize work for all uses of... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-08-03	Elijah Newren	t6038: remove problematic test Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-08-03	Elijah Newren	t6038: make tests fail for the right reason Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-08-02	Elijah Newren	merge-recursive: fix unclear and outright wrong comments Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-07-28	Elijah Newren	hashmap: fix typo in usage docs Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-07-28	Elijah Newren	Remove doubled words in various comments Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-06-22	Elijah Newren	git-prompt: include sparsity state as well Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-06-22	Elijah Newren	git-prompt: document how in-progress operations affect... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-06-18	Elijah Newren	wt-status: show sparse checkout status as well Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-06-13	Elijah Newren	clean: optimize and document cases where we recurse... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-06-13	Elijah Newren	clean: consolidate handling of ignored parameters Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-06-13	Elijah Newren	dir, clean: avoid disallowed behavior Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-06-13	Elijah Newren	dir: fix a few confusing comments Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-06-13	Elijah Newren	git-sparse-checkout: clarify interactions with submodules Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-06-05	Elijah Newren	dir: fix treatment of negated pathspecs Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-06-05	Elijah Newren	sparse-checkout: avoid staging deletions of all files Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-05-31	Elijah Newren	fast-import: add new --date-format=raw-permissive format Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-05-15	Elijah Newren	unpack-trees: also allow get_progress() to work on... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-05-14	Elijah Newren	merge-recursive: fix rename/rename(1to2) for working... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-04-27	Elijah Newren	rebase: display an error if --root and --fork-point... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-04-11	Elijah Newren	rebase: fix an incompatible-options error message Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-04-11	Elijah Newren	rebase: reinstate --no-keep-empty Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-04-11	Elijah Newren	rebase -i: mark commits that begin empty in todo editor Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-04-07	Elijah Newren	sequencer: honor GIT_REFLOG_ACTION Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-04-05	Elijah Newren	git-rebase.txt: add another hook to the hooks section... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-04-01	Elijah Newren	completion: fix 'git add' on paths under an untracked... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-04-01	Elijah Newren	Fix error-prone fill_directory() API; make it only... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2020-04-01	Elijah Newren	dir: replace double pathspec matching with single in... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
next

The Best VCS Around

RSS Atom