delta/git.git - github.com: git/git.git

	Commit message (Expand)	Author	Age	Files	Lines
*	files_transaction_prepare(): fix handling of ref lock failuremh/ref-locking-fix	Michael Haggerty	2017-10-25	2	-9/+9
*	t1404: add a bunch of tests of D/F conflicts	Michael Haggerty	2017-10-25	1	-0/+141
*	files_transaction_finish(): delete reflogs before referencesmh/packed-ref-transactions	Michael Haggerty	2017-09-09	1	-14/+21
*	packed-backend: rip out some now-unused code	Michael Haggerty	2017-09-09	2	-201/+0
*	files_ref_store: use a transaction to update packed refs	Michael Haggerty	2017-09-09	2	-33/+103
*	t1404: demonstrate two problems with reference transactions	Michael Haggerty	2017-09-09	1	-0/+73
*	files_initial_transaction_commit(): use a transaction for packed refs	Michael Haggerty	2017-09-09	1	-10/+19
*	prune_refs(): also free the linked list	Michael Haggerty	2017-09-09	1	-4/+10
*	files_pack_refs(): use a reference transaction to write packed refs	Michael Haggerty	2017-09-09	1	-7/+17
*	packed_delete_refs(): implement method	Michael Haggerty	2017-09-09	2	-2/+45
*	packed_ref_store: implement reference transactions	Michael Haggerty	2017-09-09	2	-3/+319
*	struct ref_transaction: add a place for backends to store data	Michael Haggerty	2017-09-09	1	-0/+1
*	packed-backend: don't adjust the reference count on lock/unlock	Michael Haggerty	2017-09-09	1	-5/+5
*	The fifth batch post 2.14	Junio C Hamano	2017-08-26	1	-1/+49
*	Merge branch 'mg/killed-merge'	Junio C Hamano	2017-08-26	3	-4/+31
\|\
\| *	merge: save merge state earliermg/killed-merge	Michael J Gruber	2017-08-23	2	-0/+17
\| *	merge: split write_merge_state in two	Michael J Gruber	2017-08-23	1	-3/+8
\| *	merge: clarify call chain	Michael J Gruber	2017-08-23	1	-0/+2
\| *	Documentation/git-merge: explain --continue	Michael J Gruber	2017-08-21	1	-1/+4
* \|	Merge branch 'jt/packmigrate'	Junio C Hamano	2017-08-26	37	-2014/+2081
\|\ \
\| * \|	pack: move for_each_packed_object()	Jonathan Tan	2017-08-23	6	-46/+54
\| * \|	pack: move has_pack_index()	Jonathan Tan	2017-08-23	4	-10/+10
\| * \|	pack: move has_sha1_pack()	Jonathan Tan	2017-08-23	7	-8/+11
\| * \|	pack: move find_pack_entry() and make it global	Jonathan Tan	2017-08-23	3	-53/+55
\| * \|	pack: move find_sha1_pack()	Jonathan Tan	2017-08-23	6	-16/+18
\| * \|	pack: move find_pack_entry_one(), is_pack_valid()	Jonathan Tan	2017-08-23	4	-84/+82
\| * \|	pack: move check_pack_index_ptr(), nth_packed_object_offset()	Jonathan Tan	2017-08-23	4	-49/+49
\| * \|	pack: move nth_packed_object_{sha1,oid}	Jonathan Tan	2017-08-23	4	-46/+46
\| * \|	pack: move clear_delta_base_cache(), packed_object_info(), unpack_entry()	Jonathan Tan	2017-08-23	4	-670/+685
\| * \|	pack: move unpack_object_header()	Jonathan Tan	2017-08-23	4	-27/+27
\| * \|	pack: move get_size_from_delta()	Jonathan Tan	2017-08-23	4	-40/+41
\| * \|	pack: move unpack_object_header_buffer()	Jonathan Tan	2017-08-23	4	-26/+27
\| * \|	pack: move {,re}prepare_packed_git and approximate_object_count	Jonathan Tan	2017-08-23	11	-232/+238
\| * \|	pack: move install_packed_git()	Jonathan Tan	2017-08-23	4	-11/+12
\| * \|	pack: move add_packed_git()	Jonathan Tan	2017-08-23	5	-62/+55
\| * \|	pack: move unuse_pack()	Jonathan Tan	2017-08-23	4	-10/+10
\| * \|	pack: move use_pack()	Jonathan Tan	2017-08-23	5	-306/+298
\| * \|	pack: move pack-closing functions	Jonathan Tan	2017-08-23	9	-63/+70
\| * \|	pack: move release_pack_memory()	Jonathan Tan	2017-08-23	4	-51/+53
\| * \|	pack: move open_pack_index(), parse_pack_index()	Jonathan Tan	2017-08-23	10	-148/+163
\| * \|	pack: move pack_report()	Jonathan Tan	2017-08-23	4	-26/+26
\| * \|	pack: move static state variables	Jonathan Tan	2017-08-23	3	-13/+23
\| * \|	pack: move pack name-related functions	Jonathan Tan	2017-08-23	10	-45/+56
* \| \|	Merge branch 'mh/ref-lock-entry'	Junio C Hamano	2017-08-26	4	-5/+39
\|\ \ \
\| * \| \|	refs: retry acquiring reference locks for 100msmh/ref-lock-entry	Michael Haggerty	2017-08-23	4	-5/+39
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'jt/doc-pack-objects-fix'	Junio C Hamano	2017-08-26	1	-6/+11
\|\ \ \
\| * \| \|	Doc: clarify that pack-objects makes packs, pluraljt/doc-pack-objects-fix	Jonathan Tan	2017-08-23	1	-6/+11
* \| \| \|	Merge branch 'jc/cutoff-config'	Junio C Hamano	2017-08-26	5	-31/+79
\|\ \ \ \
\| * \| \| \|	rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedjc/cutoff-config	Junio C Hamano	2017-08-22	5	-12/+31
\| * \| \| \|	rerere: represent time duration in timestamp_t internally	Junio C Hamano	2017-08-22	1	-13/+23