Public Git Hosting - git.git/search

2023-02-27	Elijah Newren	unpack-trees: add usage notices around df_conflict_entry Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-02-27	Elijah Newren	unpack-trees: special case read-tree debugging as internal... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-02-27	Elijah Newren	unpack-trees: rewrap a few overlong lines from previous... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-02-27	Elijah Newren	unpack-trees: mark fields only used internally as internal Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-02-27	Elijah Newren	unpack_trees: start splitting internal fields from... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-02-27	Elijah Newren	sparse-checkout: avoid using internal API of unpack... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-02-27	Elijah Newren	sparse-checkout: avoid using internal API of unpack... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-02-27	Elijah Newren	unpack-trees: clean up some flow control Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-02-27	Elijah Newren	dir: mark output only fields of dir_struct as such Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-02-27	Elijah Newren	dir: add a usage note to exclude_per_dir Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-02-27	Elijah Newren	dir: separate public from internal portion of dir_struct Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-02-27	Elijah Newren	unpack-trees: heed requests to overwrite ignored files Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-02-27	Elijah Newren	t2021: fix platform-specific leftover cruft Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-02-09	Elijah Newren	name-rev: fix names by dropping taggerdate workaround Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-01-25	Elijah Newren	rebase: provide better error message for apply options... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-01-25	Elijah Newren	rebase: put rebase_options initialization in single... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-01-25	Elijah Newren	rebase: fix formatting of rebase --reapply-cherry-picks... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-01-25	Elijah Newren	rebase: clarify the OPT_CMDMODE incompatibilities Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-01-25	Elijah Newren	rebase: add coverage of other incompatible options Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-01-25	Elijah Newren	rebase: fix incompatiblity checks for --[no-]reapply... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-01-25	Elijah Newren	rebase: fix docs about incompatibilities with --root Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-01-25	Elijah Newren	rebase: remove --allow-empty-message from incompatible... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-01-25	Elijah Newren	rebase: flag --apply and --merge as incompatible Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-01-25	Elijah Newren	rebase: mark --update-refs as requiring the merge backend Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-01-15	Elijah Newren	t6426: fix TODO about making test more comprehensive Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-01-13	Elijah Newren	ls-files: guide folks to --exclude-standard over other... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-01-13	Elijah Newren	ls-files: clarify descriptions of status tags for -t Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-01-13	Elijah Newren	ls-files: clarify descriptions of file selection options Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2023-01-13	Elijah Newren	ls-files: add missing documentation for --resolve-undo... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-11-07	Elijah Newren	sparse-checkout.txt: new document with sparse-checkout... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-10-23	Elijah Newren	merge-tree: support multiple batched merges with -... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-10-23	Elijah Newren	merge-tree: update documentation for differences in... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-10-22	Elijah Newren	merge-ort: fix bug with dir rename vs change dir to... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-09-02	Elijah Newren	diff: fix filtering of merge commits under --remerge... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-09-02	Elijah Newren	diff: fix filtering of additional headers under --remerge... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-09-02	Elijah Newren	diff: have submodule_format logic avoid additional... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-08-26	Elijah Newren	t64xx: convert 'test_create_repo' to 'git init' Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-08-24	Elijah Newren	t4301: add more interesting merge-tree testcases Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-08-24	Elijah Newren	merge: small code readability improvement Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-08-24	Elijah Newren	merge: cleanup confusing logic for handling successful... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-08-24	Elijah Newren	merge: only apply autostash when appropriate Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-08-19	Elijah Newren	revision: allow --ancestry-path to take an argument Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-08-19	Elijah Newren	rev-list-options.txt: fix simple typo Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-08-19	Elijah Newren	merge-ort: remove code obsoleted by other changes Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-08-18	Elijah Newren	merge-ort: provide helpful submodule update message... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-08-18	Elijah Newren	merge-ort: avoid surprise with new sub_flag variable Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-08-18	Elijah Newren	merge-ort: remove translator lego in new "submodule... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-07-23	Elijah Newren	merge: do not exit restore_state() prematurely Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-07-23	Elijah Newren	merge: ensure we can actually restore pre-merge state Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-07-23	Elijah Newren	merge: make restore_state() restore staged state too Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-07-23	Elijah Newren	merge: fix save_state() to work when there are stat... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-07-23	Elijah Newren	merge: do not abort early if one strategy fails to... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-07-23	Elijah Newren	merge: abort if index does not match HEAD for trivial... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-07-23	Elijah Newren	merge-resolve: abort if index does not match HEAD Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-07-23	Elijah Newren	merge-ort-wrappers: make printed message match the... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-07-06	Elijah Newren	merge-ort: fix issue with dual rename and add/add conflict Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-07-06	Elijah Newren	merge-ort: shuffle the computation and cleanup of potential... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-07-06	Elijah Newren	t6423: add tests of dual directory rename plus add... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-06-22	Elijah Newren	git-merge-tree.txt: add a section on potentional usage... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-06-22	Elijah Newren	merge-tree: add a --allow-unrelated-histories flag Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-06-22	Elijah Newren	merge-tree: allow `ls-files -u` style info to be NUL... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2022-06-22	Elijah Newren	merge-ort: optionally produce machine-readable output Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
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
next

The Best VCS Around

RSS Atom