pub/scm/git/git.git - Git source code mirror

Age	Commit message (Expand)	Author	Files	Lines
2020-12-14	pull: give the advice for choosing rebase/merge much later	Felipe Contreras	1	-14/+18
2020-12-14	pull: refactor fast-forward check	Felipe Contreras	1	-11/+15
2020-12-14	merge-ort: add basic outline for process_renames()	Elijah Newren	1	-1/+97
2020-12-14	merge-ort: implement compare_pairs() and collect_renames()	Elijah Newren	1	-2/+33
2020-12-14	merge-ort: implement detect_regular_renames()	Elijah Newren	1	-1/+31
2020-12-14	merge-ort: add initial outline for basic rename detection	Elijah Newren	1	-8/+60
2020-12-14	merge-ort: add basic data structures for handling renames	Elijah Newren	1	-0/+24
2020-12-14	index-format.txt: document v2 format of file system monitor extension	Jeff Hostetler	1	-2/+8
2020-12-14	docs: multi-pack-index: remove note about future 'verify' work	Johannes Berg	1	-4/+0
2020-12-13	init: provide useful advice about init.defaultBranch	Johannes Schindelin	4	-4/+29
2020-12-13	get_default_branch_name(): prepare for showing some advice	Johannes Schindelin	5	-11/+14
2020-12-13	branch -m: allow renaming a yet-unborn branch	Johannes Schindelin	2	-1/+11
2020-12-13	init: document `init.defaultBranch` better	Johannes Schindelin	1	-4/+7
2020-12-13	merge-ort: add modify/delete handling and delayed output processing	Elijah Newren	1	-2/+98
2020-12-13	merge-ort: add die-not-implemented stub handle_content_merge() function	Elijah Newren	1	-0/+14
2020-12-13	merge-ort: add function grouping comments	Elijah Newren	1	-0/+21
2020-12-13	merge-ort: add a paths_to_free field to merge_options_internal	Elijah Newren	1	-1/+25
2020-12-13	merge-ort: add a path_conflict field to merge_options_internal	Elijah Newren	1	-0/+7
2020-12-13	merge-ort: add a clear_internal_opts helper	Elijah Newren	1	-16/+24
2020-12-13	merge-ort: add a few includes	Elijah Newren	1	-0/+2
2020-12-13	merge-ort: free data structures in merge_finalize()	Elijah Newren	1	-1/+31
2020-12-13	merge-ort: add implementation of record_conflicted_index_entries()	Elijah Newren	1	-1/+87
2020-12-13	tree: enable cmp_cache_name_compare() to be used elsewhere	Elijah Newren	2	-1/+3
2020-12-13	merge-ort: add implementation of checkout()	Elijah Newren	1	-1/+44
2020-12-13	merge-ort: basic outline for merge_switch_to_result()	Elijah Newren	1	-1/+41
2020-12-13	merge-ort: step 3 of tree writing -- handling subdirectories as we go	Elijah Newren	1	-8/+234
2020-12-13	merge-ort: step 2 of tree writing -- function to create tree object	Elijah Newren	1	-1/+66
2020-12-13	merge-ort: step 1 of tree writing -- record basenames, modes, and oids	Elijah Newren	1	-3/+37
2020-12-13	merge-ort: have process_entries operate in a defined order	Elijah Newren	1	-3/+50
2020-12-13	merge-ort: add a preliminary simple process_entries() implementation	Elijah Newren	1	-1/+102
2020-12-13	merge-ort: avoid recursing into identical trees	Elijah Newren	1	-0/+13
2020-12-13	merge-ort: record stage and auxiliary info for every path	Elijah Newren	1	-7/+90
2020-12-13	merge-ort: compute a few more useful fields for collect_merge_info	Elijah Newren	1	-0/+36
2020-12-13	merge-ort: avoid repeating fill_tree_descriptor() on the same tree	Elijah Newren	1	-4/+22
2020-12-13	merge-ort: implement a very basic collect_merge_info()	Elijah Newren	1	-1/+134
2020-12-13	merge-ort: add an err() function similar to one from merge-recursive	Elijah Newren	2	-3/+37
2020-12-13	merge-ort: use histogram diff	Elijah Newren	1	-0/+4
2020-12-13	merge-ort: port merge_start() from merge-recursive	Elijah Newren	1	-1/+44
2020-12-13	merge-ort: add some high-level algorithm structure	Elijah Newren	1	-1/+67
2020-12-13	merge-ort: setup basic internal data structures	Elijah Newren	1	-0/+147
2020-12-12	rev-parse: add option for absolute or relative path formatting	brian m. carlson	3	-43/+194
2020-12-12	abspath: add a function to resolve paths with missing components	brian m. carlson	2	-18/+48
2020-12-09	t7900: use --fixed-value in git-maintenance tests	Josh Steadmon	1	-2/+2
2020-12-09	pretty format %(trailers) doc: avoid repetition	Ævar Arnfjörð Bjarmason	1	-14/+16
2020-12-09	pretty format %(trailers): add a "key_value_separator"	Ævar Arnfjörð Bjarmason	5	-3/+55
2020-12-09	pretty format %(trailers): add a "keyonly"	Ævar Arnfjörð Bjarmason	5	-6/+40
2020-12-09	pretty-format %(trailers): fix broken standalone "valueonly"	Ævar Arnfjörð Bjarmason	2	-1/+30
2020-12-09	submodules: fix of regression on fetching of non-init subsub-repo	Peter Kaestle	2	-1/+123
2020-12-08	Makefile: don't use a versioned temp distribution directory	Ramsay Jones	1	-7/+8
2020-12-08	Makefile: don't try to clean old debian build product	Ramsay Jones	1	-1/+1