Public Git Hosting - git.git/search

2022-06-22	Elijah Newren	merge-ort: store more specific conflict information Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-06-22	Elijah Newren	merge-tree: provide easy access to `ls-files -u` style... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-06-22	Elijah Newren	merge-tree: provide a list of which files have conflicts Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-06-22	Elijah Newren	merge-ort: remove command-line-centric submodule message... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-06-22	Elijah Newren	merge-ort: provide a merge_get_conflicted_files() helper... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-06-22	Elijah Newren	merge-tree: support including merge messages in output Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-06-22	Elijah Newren	merge-ort: split out a separate display_update_messages... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-06-22	Elijah Newren	merge-tree: implement real merges Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-06-22	Elijah Newren	merge-tree: add option parsing and initial shell for... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-06-22	Elijah Newren	merge-tree: move logic for existing merge into new... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-06-22	Elijah Newren	merge-tree: rename merge_trees() to trivial_merge_trees() Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-04-22	Elijah Newren	Documentation: some sparsity wording clarifications Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-04-22	Elijah Newren	git-sparse-checkout.txt: mark non-cone mode as deprecated Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-04-22	Elijah Newren	git-sparse-checkout.txt: flesh out pattern set sections... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-04-22	Elijah Newren	git-sparse-checkout.txt: add a new EXAMPLES section Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-04-22	Elijah Newren	git-sparse-checkout.txt: shuffle some sections and... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-04-22	Elijah Newren	git-sparse-checkout.txt: update docs for deprecation... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-04-22	Elijah Newren	git-sparse-checkout.txt: wording updates for the cone... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-04-22	Elijah Newren	sparse-checkout: make --cone the default Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-04-22	Elijah Newren	tests: stop assuming --no-cone is the default mode... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-03-02	Elijah Newren	repo_read_index: add config to expect files outside... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-03-02	Elijah Newren	merge-ort: exclude messages from inner merges by default Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-02-20	Elijah Newren	merge-ort: fix small memory leak in unique_path() Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-02-20	Elijah Newren	merge-ort: fix small memory leak in detect_and_process_renames() Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-02-20	Elijah Newren	sparse-checkout: reject arguments in cone-mode that... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-02-20	Elijah Newren	sparse-checkout: error or warn when given individual... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-02-20	Elijah Newren	sparse-checkout: pay attention to prefix for {set,... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-02-20	Elijah Newren	sparse-checkout: correctly set non-cone mode when expected Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-02-20	Elijah Newren	sparse-checkout: correct reapply's handling of options Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-02-17	Elijah Newren	merge-ort: make informational messages from recursive... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-02-02	Elijah Newren	diff-merges: avoid history simplifications when diffing... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-02-02	Elijah Newren	merge-ort: mark conflict/warning messages from inner... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-02-02	Elijah Newren	show, log: include conflict/warning messages in --remerge... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-02-02	Elijah Newren	diff: add ability to insert additional headers for... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-02-02	Elijah Newren	merge-ort: format messages slightly different for use... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-02-02	Elijah Newren	merge-ort: mark a few more conflict messages as omittable Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-02-02	Elijah Newren	merge-ort: capture and print ll-merge warnings in our... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-02-02	Elijah Newren	ll-merge: make callers responsible for showing warnings Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-02-02	Elijah Newren	log: clean unneeded objects during `log --remerge-diff` Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-02-02	Elijah Newren	show, log: provide a --remerge-diff capability Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-02-02	Elijah Newren	repo-settings: rename the traditional default fetch... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-02-02	Elijah Newren	repo-settings: fix error handling for unknown values Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-02-02	Elijah Newren	repo-settings: fix checking for fetch.negotiationAlgorithm... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-01-28	Elijah Newren	sparse-checkout: fix a couple minor memory leaks Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-01-26	Elijah Newren	sequencer, stash: fix running from worktree subdir Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-01-21	Elijah Newren	merge: fix memory leaks in cmd_merge() Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-01-21	Elijah Newren	merge-ort: fix memory leak in merge_ort_internal() Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-01-17	Elijah Newren	merge-ort: avoid assuming all renames detected Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-01-14	Elijah Newren	Accelerate clear_skip_worktree_from_present_files(... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-01-14	Elijah Newren	Update documentation related to sparsity and the skip... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-01-14	Elijah Newren	repo_read_index: clear SKIP_WORKTREE bit from files... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-01-14	Elijah Newren	unpack-trees: fix accidental loss of user changes Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-01-14	Elijah Newren	t1011: add testcase demonstrating accidental loss of... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-01-04	Elijah Newren	stash: do not return before restoring untracked files Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-30	Elijah Newren	merge-ort: fix bug with renormalization and rename... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-23	Elijah Newren	sparse-checkout: remove stray trailing space Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-15	Elijah Newren	clone: avoid using deprecated `sparse-checkout init` Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-15	Elijah Newren	Documentation: clarify/correct a few sparsity related... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-15	Elijah Newren	git-sparse-checkout.txt: update to document init/set... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-15	Elijah Newren	sparse-checkout: enable reapply to take --[no-]{cone... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-15	Elijah Newren	sparse-checkout: enable `set` to initialize sparse... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-15	Elijah Newren	sparse-checkout: split out code for tweaking settings... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-15	Elijah Newren	sparse-checkout: disallow --no-stdin as an argument... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-15	Elijah Newren	sparse-checkout: add sanity-checks on initial sparsity... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-15	Elijah Newren	sparse-checkout: break apart functions for sparse_checkout_... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-15	Elijah Newren	sparse-checkout: pass use_stdin as a parameter instead... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-09	Elijah Newren	t2501: simplify the tests since we can now assume desired... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-09	Elijah Newren	dir: new flag to remove_dir_recurse() to spare the... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-09	Elijah Newren	dir: avoid incidentally removing the original_cwd in... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-09	Elijah Newren	stash: do not attempt to remove startup_info->original_cwd Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-09	Elijah Newren	rebase: do not attempt to remove startup_info->original_cwd Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-09	Elijah Newren	clean: do not attempt to remove startup_info->original_cwd Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-09	Elijah Newren	symlinks: do not include startup_info->original_cwd... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-09	Elijah Newren	unpack-trees: add special cwd handling Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-09	Elijah Newren	unpack-trees: refuse to remove startup_info->original_cwd Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-09	Elijah Newren	setup: introduce startup_info->original_cwd Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-09	Elijah Newren	t2501: add various tests for removing the current working... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-05	Elijah Newren	sequencer: do not export GIT_DIR and GIT_WORK_TREE... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-05	Elijah Newren	name-rev: prefer shorter names over following merges Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-12-01	Elijah Newren	update documentation for new zdiff3 conflictStyle Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-11-30	Elijah Newren	sequencer: avoid adding exec commands for non-commit... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-27	Elijah Newren	Documentation: call out commands that nuke untracked... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-27	Elijah Newren	Comment important codepaths regarding nuking untracked... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-27	Elijah Newren	unpack-trees: avoid nuking untracked dir in way of... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-27	Elijah Newren	unpack-trees: avoid nuking untracked dir in way of... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-27	Elijah Newren	Change unpack_trees' 'reset' flag into an enum Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-27	Elijah Newren	Remove ignored files by default when they are in the way Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-27	Elijah Newren	unpack-trees: make dir an internal-only struct Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-27	Elijah Newren	unpack-trees: introduce preserve_ignored to unpack_trees_options Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-27	Elijah Newren	read-tree, merge-recursive: overwrite ignored files... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-27	Elijah Newren	checkout, read-tree: fix leak of unpack_trees_options.dir Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-24	Elijah Newren	t2500: add various tests for nuking untracked files Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-20	Elijah Newren	merge-ort: fix completely wrong comment Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-20	Elijah Newren	trace2.h: fix trivial comment typo Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-12	Elijah Newren	tests: remove leftover untracked files Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-10	Elijah Newren	am: fix incorrect exit status on am fail to abort Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-10	Elijah Newren	t4151: add a few am --abort tests Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-10	Elijah Newren	git-am.txt: clarify --abort behavior Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-10	Elijah Newren	stash: restore untracked files AFTER restoring tracked... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2021-09-10	Elijah Newren	stash: avoid feeding directories to update-index Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
next

The Best VCS Around

RSS Atom