summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Documentation/githooks: mention merge in commit-msg hooksb/merge-commit-msg-hookStefan Beller2017-09-221-5/+4
* builtin/merge: honor commit-msg hook for mergesStefan Beller2017-09-082-4/+68
* The sixth batch post 2.14Junio C Hamano2017-09-061-0/+10
* Merge branch 'rs/archive-excluded-directory'Junio C Hamano2017-09-062-11/+85
|\
| * archive: don't queue excluded directoriesRené Scharfe2017-08-192-9/+27
| * archive: factor out helper functions for handling attributesRené Scharfe2017-08-191-8/+23
| * t5001: add tests for export-ignore attributes and exclude pathspecsRené Scharfe2017-08-191-3/+44
* | Merge branch 'po/read-graft-line'Junio C Hamano2017-09-064-23/+29
|\ \
| * | commit: rewrite read_graft_linepo/read-graft-linePatryk Obara2017-08-181-15/+21
| * | commit: allocate array using object_id sizePatryk Obara2017-08-181-1/+2
| * | commit: replace the raw buffer with strbuf in read_graft_linePatryk Obara2017-08-183-14/+13
| * | sha1_file: fix definition of null_sha1Patryk Obara2017-08-171-1/+1
* | | Merge branch 'ks/branch-set-upstream'Junio C Hamano2017-09-065-92/+23
|\ \ \
| * | | branch: quote branch/ref names to improve readabilityks/branch-set-upstreamKaartic Sivaraam2017-08-171-8/+8
| * | | builtin/branch: stop supporting the "--set-upstream" optionKaartic Sivaraam2017-08-174-84/+14
| * | | t3200: cleanup cruft of a testKaartic Sivaraam2017-08-171-0/+1
| |/ /
* | | The fifth batch post 2.14Junio C Hamano2017-08-261-1/+49
* | | Merge branch 'mg/killed-merge'Junio C Hamano2017-08-263-4/+31
|\ \ \
| * | | merge: save merge state earliermg/killed-mergeMichael J Gruber2017-08-232-0/+17
| * | | merge: split write_merge_state in twoMichael J Gruber2017-08-231-3/+8
| * | | merge: clarify call chainMichael J Gruber2017-08-231-0/+2
| * | | Documentation/git-merge: explain --continueMichael J Gruber2017-08-211-1/+4
| | |/ | |/|
* | | Merge branch 'jt/packmigrate'Junio C Hamano2017-08-2637-2014/+2081
|\ \ \
| * | | pack: move for_each_packed_object()Jonathan Tan2017-08-236-46/+54
| * | | pack: move has_pack_index()Jonathan Tan2017-08-234-10/+10
| * | | pack: move has_sha1_pack()Jonathan Tan2017-08-237-8/+11
| * | | pack: move find_pack_entry() and make it globalJonathan Tan2017-08-233-53/+55
| * | | pack: move find_sha1_pack()Jonathan Tan2017-08-236-16/+18
| * | | pack: move find_pack_entry_one(), is_pack_valid()Jonathan Tan2017-08-234-84/+82
| * | | pack: move check_pack_index_ptr(), nth_packed_object_offset()Jonathan Tan2017-08-234-49/+49
| * | | pack: move nth_packed_object_{sha1,oid}Jonathan Tan2017-08-234-46/+46
| * | | pack: move clear_delta_base_cache(), packed_object_info(), unpack_entry()Jonathan Tan2017-08-234-670/+685
| * | | pack: move unpack_object_header()Jonathan Tan2017-08-234-27/+27
| * | | pack: move get_size_from_delta()Jonathan Tan2017-08-234-40/+41
| * | | pack: move unpack_object_header_buffer()Jonathan Tan2017-08-234-26/+27
| * | | pack: move {,re}prepare_packed_git and approximate_object_countJonathan Tan2017-08-2311-232/+238
| * | | pack: move install_packed_git()Jonathan Tan2017-08-234-11/+12
| * | | pack: move add_packed_git()Jonathan Tan2017-08-235-62/+55
| * | | pack: move unuse_pack()Jonathan Tan2017-08-234-10/+10
| * | | pack: move use_pack()Jonathan Tan2017-08-235-306/+298
| * | | pack: move pack-closing functionsJonathan Tan2017-08-239-63/+70
| * | | pack: move release_pack_memory()Jonathan Tan2017-08-234-51/+53
| * | | pack: move open_pack_index(), parse_pack_index()Jonathan Tan2017-08-2310-148/+163
| * | | pack: move pack_report()Jonathan Tan2017-08-234-26/+26
| * | | pack: move static state variablesJonathan Tan2017-08-233-13/+23
| * | | pack: move pack name-related functionsJonathan Tan2017-08-2310-45/+56
* | | | Merge branch 'mh/ref-lock-entry'Junio C Hamano2017-08-264-5/+39
|\ \ \ \
| * | | | refs: retry acquiring reference locks for 100msmh/ref-lock-entryMichael Haggerty2017-08-234-5/+39
| | |/ / | |/| |
* | | | Merge branch 'jt/doc-pack-objects-fix'Junio C Hamano2017-08-261-6/+11
|\ \ \ \
| * | | | Doc: clarify that pack-objects makes packs, pluraljt/doc-pack-objects-fixJonathan Tan2017-08-231-6/+11