Show patches with: Archived = No       |   22418 patches
« 1 2 ... 206 207 208 … 224 225 »
Patch Series A/R/T S/W/F Date Submitter Delegate State
[05/10] merge-ort: flesh out implementation of handle_content_merge() merge-ort: add more handling of basic conflict types - - - --- 2020-12-18 Elijah Newren Superseded
[04/10] merge-ort: handle book-keeping around two- and three-way content merge merge-ort: add more handling of basic conflict types - - - --- 2020-12-18 Elijah Newren Superseded
[03/10] merge-ort: implement unique_path() helper merge-ort: add more handling of basic conflict types - - - --- 2020-12-18 Elijah Newren Superseded
[02/10] merge-ort: handle directory/file conflicts that remain merge-ort: add more handling of basic conflict types - - - --- 2020-12-18 Elijah Newren Superseded
[01/10] merge-ort: handle D/F conflict where directory disappears due to merge merge-ort: add more handling of basic conflict types - - - --- 2020-12-18 Elijah Newren Superseded
[v3] mergetool: add automerge configuration [v3] mergetool: add automerge configuration - - - --- 2020-12-17 Felipe Contreras Superseded
[v2] pack-redundant: fix crash when one packfile in repo [v2] pack-redundant: fix crash when one packfile in repo - - - --- 2020-12-17 Jiang Xin Accepted
Re* [PATCH] diff: suppress --name-only paths where all hunks are ignored Re* [PATCH] diff: suppress --name-only paths where all hunks are ignored - - - --- 2020-12-17 Junio C Hamano Accepted
[11/11] tests: drop the `PREPARE_FOR_MAIN_BRANCH` prereq Drop the PREPARE_FOR_MAIN_BRANCH prereq - - - --- 2020-12-17 Johannes Schindelin Accepted
[10/11] t9902: use `main` as initial branch name Drop the PREPARE_FOR_MAIN_BRANCH prereq - - - --- 2020-12-17 Johannes Schindelin Accepted
[09/11] t6302: use `main` as initial branch name Drop the PREPARE_FOR_MAIN_BRANCH prereq - - - --- 2020-12-17 Johannes Schindelin Accepted
[08/11] t5703: use `main` as initial branch name Drop the PREPARE_FOR_MAIN_BRANCH prereq - - - --- 2020-12-17 Johannes Schindelin Accepted
[07/11] t5510: use `main` as initial branch name Drop the PREPARE_FOR_MAIN_BRANCH prereq - - - --- 2020-12-17 Johannes Schindelin Accepted
[06/11] t5505: finalize transitioning to using the branch name `main` Drop the PREPARE_FOR_MAIN_BRANCH prereq - - - --- 2020-12-17 Johannes Schindelin Accepted
[05/11] t3205: finalize transitioning to using the branch name `main` Drop the PREPARE_FOR_MAIN_BRANCH prereq - - - --- 2020-12-17 Johannes Schindelin Accepted
[04/11] t3203: complete the transition to using the branch name `main` Drop the PREPARE_FOR_MAIN_BRANCH prereq - - - --- 2020-12-17 Johannes Schindelin Accepted
[03/11] t3201: finalize transitioning to using the branch name `main` Drop the PREPARE_FOR_MAIN_BRANCH prereq - - - --- 2020-12-17 Johannes Schindelin Accepted
[02/11] t3200: finish transitioning to the initial branch name `main` Drop the PREPARE_FOR_MAIN_BRANCH prereq - - - --- 2020-12-17 Johannes Schindelin Accepted
[01/11] t1400: use `main` as initial branch name Drop the PREPARE_FOR_MAIN_BRANCH prereq - - - --- 2020-12-17 Johannes Schindelin Accepted
[v5,4/4] merge-ort: implement merge_incore_recursive() merge-ort: implement recursive merges - - - --- 2020-12-16 Elijah Newren Accepted
[v5,3/4] merge-ort: make clear_internal_opts() aware of partial clearing merge-ort: implement recursive merges - - - --- 2020-12-16 Elijah Newren Accepted
[v5,2/4] merge-ort: copy a few small helper functions from merge-recursive.c merge-ort: implement recursive merges - - - --- 2020-12-16 Elijah Newren Accepted
[v5,1/4] commit: move reverse_commit_list() from merge-recursive merge-ort: implement recursive merges - - - --- 2020-12-16 Elijah Newren Accepted
[1/1] config.mak.uname: remove old NonStop compatibility settings Remove obsolete compatibility settings for NonStop - - - --- 2020-12-16 Randall S. Becker Accepted
[RFC/PATCH] mergetool: use resolved conflicts in all the views [RFC/PATCH] mergetool: use resolved conflicts in all the views - - - --- 2020-12-16 Felipe Contreras Superseded
[v3,3/3] merge-ort: implement merge_incore_recursive() merge-ort: implement recursive merges - - - --- 2020-12-16 Elijah Newren Superseded
[v3,2/3] merge-ort: make clear_internal_opts() aware of partial clearing merge-ort: implement recursive merges - - - --- 2020-12-16 Elijah Newren Superseded
[v3,1/3] merge-ort: copy a few small helper functions from merge-recursive.c merge-ort: implement recursive merges - - - --- 2020-12-16 Elijah Newren Superseded
pack-redundant: fix crash when one packfile in repo pack-redundant: fix crash when one packfile in repo - - - --- 2020-12-16 Jiang Xin Superseded
t/perf: fix test_export() failure with BSD `sed` t/perf: fix test_export() failure with BSD `sed` - - - --- 2020-12-16 Eric Sunshine Accepted
[v2,3/3] merge-ort: implement merge_incore_recursive() merge-ort: implement recursive merges - - - --- 2020-12-16 Elijah Newren Superseded
[v2,2/3] merge-ort: make clear_internal_opts() aware of partial clearing merge-ort: implement recursive merges - - - --- 2020-12-16 Elijah Newren Superseded
[v2,1/3] merge-ort: copy a few small helper functions from merge-recursive.c merge-ort: implement recursive merges - - - --- 2020-12-16 Elijah Newren Superseded
[v2,3/3] clone: respect remote unborn HEAD Cloning with remote unborn HEAD - - - --- 2020-12-16 Jonathan Tan Superseded
[v2,2/3] connect, transport: add no-op arg for future patch Cloning with remote unborn HEAD - - - --- 2020-12-16 Jonathan Tan Superseded
[v2,1/3] ls-refs: report unborn targets of symrefs Cloning with remote unborn HEAD - - - --- 2020-12-16 Jonathan Tan Superseded
[2/2] style: do not "break" in switch() after "return" [1/2] strmap: do not "return" in a void function - - - --- 2020-12-15 Ævar Arnfjörð Bjarmason Accepted
[1/2] strmap: do not "return" in a void function [1/2] strmap: do not "return" in a void function - - - --- 2020-12-15 Ævar Arnfjörð Bjarmason Accepted
compat-util: pretend that stub setitimer() always succeeds compat-util: pretend that stub setitimer() always succeeds - - - --- 2020-12-15 Junio C Hamano Accepted
strmap: make callers of strmap_remove() to call it in void context strmap: make callers of strmap_remove() to call it in void context - - - --- 2020-12-15 Junio C Hamano Accepted
[v3,11/11] merge-ort: add implementation of type-changed rename handling merge-ort: add basic rename detection - - - --- 2020-12-15 Elijah Newren Accepted
[v3,10/11] merge-ort: add implementation of normal rename handling merge-ort: add basic rename detection - - - --- 2020-12-15 Elijah Newren Accepted
[v3,09/11] merge-ort: add implementation of rename collisions merge-ort: add basic rename detection - - - --- 2020-12-15 Elijah Newren Accepted
[v3,08/11] merge-ort: add implementation of rename/delete conflicts merge-ort: add basic rename detection - - - --- 2020-12-15 Elijah Newren Accepted
[v3,07/11] merge-ort: add implementation of both sides renaming differently merge-ort: add basic rename detection - - - --- 2020-12-15 Elijah Newren Accepted
[v3,06/11] merge-ort: add implementation of both sides renaming identically merge-ort: add basic rename detection - - - --- 2020-12-15 Elijah Newren Accepted
[v3,05/11] merge-ort: add basic outline for process_renames() merge-ort: add basic rename detection - - - --- 2020-12-15 Elijah Newren Accepted
[v3,04/11] merge-ort: implement compare_pairs() and collect_renames() merge-ort: add basic rename detection - - - --- 2020-12-15 Elijah Newren Accepted
[v3,03/11] merge-ort: implement detect_regular_renames() merge-ort: add basic rename detection - - - --- 2020-12-15 Elijah Newren Accepted
[v3,02/11] merge-ort: add initial outline for basic rename detection merge-ort: add basic rename detection - - - --- 2020-12-15 Elijah Newren Accepted
[v3,01/11] merge-ort: add basic data structures for handling renames merge-ort: add basic rename detection - - - --- 2020-12-15 Elijah Newren Accepted
[3/3] merge-ort: implement merge_incore_recursive() merge-ort: implement recursive merges - - - --- 2020-12-15 Elijah Newren Superseded
[2/3] merge-ort: make clear_internal_opts() aware of partial clearing merge-ort: implement recursive merges - - - --- 2020-12-15 Elijah Newren Superseded
[1/3] merge-ort: copy a few small helper functions from merge-recursive.c merge-ort: implement recursive merges - - - --- 2020-12-15 Elijah Newren Superseded
[v7,5/5] pull: display default warning only when non-ff making pull advice not to trigger when unneeded - - - --- 2020-12-14 Junio C Hamano Accepted
[v7,4/5] pull: correct condition to trigger non-ff advice making pull advice not to trigger when unneeded - - - --- 2020-12-14 Junio C Hamano Accepted
[v7,3/5] pull: get rid of unnecessary global variable making pull advice not to trigger when unneeded - - - --- 2020-12-14 Junio C Hamano Accepted
[v7,2/5] pull: give the advice for choosing rebase/merge much later making pull advice not to trigger when unneeded - - - --- 2020-12-14 Junio C Hamano Accepted
[v7,1/5] pull: refactor fast-forward check making pull advice not to trigger when unneeded - - - --- 2020-12-14 Junio C Hamano Accepted
[v2,11/11] merge-ort: add implementation of type-changed rename handling merge-ort: add basic rename detection - - - --- 2020-12-14 Elijah Newren Superseded
[v2,10/11] merge-ort: add implementation of normal rename handling merge-ort: add basic rename detection - - - --- 2020-12-14 Elijah Newren Superseded
[v2,09/11] merge-ort: add implementation of rename/delete conflicts merge-ort: add basic rename detection - - - --- 2020-12-14 Elijah Newren Superseded
[v2,08/11] merge-ort: add implementation of rename collisions merge-ort: add basic rename detection - - - --- 2020-12-14 Elijah Newren Superseded
[v2,07/11] merge-ort: add implementation of both sides renaming differently merge-ort: add basic rename detection - - - --- 2020-12-14 Elijah Newren Superseded
[v2,06/11] merge-ort: add implementation of both sides renaming identically merge-ort: add basic rename detection - - - --- 2020-12-14 Elijah Newren Superseded
[v2,05/11] merge-ort: add basic outline for process_renames() merge-ort: add basic rename detection - - - --- 2020-12-14 Elijah Newren Superseded
[v2,04/11] merge-ort: implement compare_pairs() and collect_renames() merge-ort: add basic rename detection - - - --- 2020-12-14 Elijah Newren Superseded
[v2,03/11] merge-ort: implement detect_regular_renames() merge-ort: add basic rename detection - - - --- 2020-12-14 Elijah Newren Superseded
[v2,02/11] merge-ort: add initial outline for basic rename detection merge-ort: add basic rename detection - - - --- 2020-12-14 Elijah Newren Superseded
[v2,01/11] merge-ort: add basic data structures for handling renames merge-ort: add basic rename detection - - - --- 2020-12-14 Elijah Newren Superseded
index-format.txt: document v2 format of file system monitor extension index-format.txt: document v2 format of file system monitor extension - - - --- 2020-12-14 Jeff Hostetler Accepted
docs: multi-pack-index: remove note about future 'verify' work docs: multi-pack-index: remove note about future 'verify' work - - - --- 2020-12-13 Johannes Berg Accepted
[v3,20/20] merge-ort: free data structures in merge_finalize() fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,19/20] merge-ort: add implementation of record_conflicted_index_entries() fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,18/20] tree: enable cmp_cache_name_compare() to be used elsewhere fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,17/20] merge-ort: add implementation of checkout() fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,16/20] merge-ort: basic outline for merge_switch_to_result() fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,15/20] merge-ort: step 3 of tree writing -- handling subdirectories as we go fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,14/20] merge-ort: step 2 of tree writing -- function to create tree object fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,13/20] merge-ort: step 1 of tree writing -- record basenames, modes, and oids fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,12/20] merge-ort: have process_entries operate in a defined order fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,11/20] merge-ort: add a preliminary simple process_entries() implementation fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,10/20] merge-ort: avoid recursing into identical trees fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,09/20] merge-ort: record stage and auxiliary info for every path fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,08/20] merge-ort: compute a few more useful fields for collect_merge_info fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,07/20] merge-ort: avoid repeating fill_tree_descriptor() on the same tree fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,06/20] merge-ort: implement a very basic collect_merge_info() fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,05/20] merge-ort: add an err() function similar to one from merge-recursive fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,04/20] merge-ort: use histogram diff fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,03/20] merge-ort: port merge_start() from merge-recursive fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,02/20] merge-ort: add some high-level algorithm structure fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,01/20] merge-ort: setup basic internal data structures fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v5,4/4] init: provide useful advice about init.defaultBranch Add helpful advice about init.defaultBranch - - - --- 2020-12-11 Johannes Schindelin Accepted
[v5,3/4] get_default_branch_name(): prepare for showing some advice Add helpful advice about init.defaultBranch - - - --- 2020-12-11 Johannes Schindelin Accepted
[v5,2/4] branch -m: allow renaming a yet-unborn branch Add helpful advice about init.defaultBranch - - - --- 2020-12-11 Johannes Schindelin Accepted
[v5,1/4] init: document `init.defaultBranch` better Add helpful advice about init.defaultBranch - - - --- 2020-12-11 Johannes Schindelin Accepted
[v2,9/9] diffcore-rename: remove unneccessary duplicate entry checks diffcore-rename improvements - - - --- 2020-12-11 Elijah Newren Accepted
[v2,8/9] diffcore-rename: accelerate rename_dst setup diffcore-rename improvements - - - --- 2020-12-11 Elijah Newren Accepted
[v2,7/9] diffcore-rename: simplify and accelerate register_rename_src() diffcore-rename improvements - - - --- 2020-12-11 Elijah Newren Accepted
[v2,6/9] t4058: explore duplicate tree entry handling in a bit more detail diffcore-rename improvements - - - --- 2020-12-11 Elijah Newren Accepted
« 1 2 ... 206 207 208 … 224 225 »