aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* t6120: test name-rev --all and --stdinMichael J Gruber2017-09-08
* t7004: move limited stack prereq to test-libMichael J Gruber2017-09-08
* The sixth batch post 2.14Junio C Hamano2017-09-06
* Merge branch 'rs/archive-excluded-directory'Junio C Hamano2017-09-06
|\
| * archive: don't queue excluded directoriesRené Scharfe2017-08-19
| * archive: factor out helper functions for handling attributesRené Scharfe2017-08-19
| * t5001: add tests for export-ignore attributes and exclude pathspecsRené Scharfe2017-08-19
* | Merge branch 'po/read-graft-line'Junio C Hamano2017-09-06
|\ \
| * | commit: rewrite read_graft_linePatryk Obara2017-08-18
| * | commit: allocate array using object_id sizePatryk Obara2017-08-18
| * | commit: replace the raw buffer with strbuf in read_graft_linePatryk Obara2017-08-18
| * | sha1_file: fix definition of null_sha1Patryk Obara2017-08-17
* | | Merge branch 'ks/branch-set-upstream'Junio C Hamano2017-09-06
|\ \ \
| * | | branch: quote branch/ref names to improve readabilityKaartic Sivaraam2017-08-17
| * | | builtin/branch: stop supporting the "--set-upstream" optionKaartic Sivaraam2017-08-17
| * | | t3200: cleanup cruft of a testKaartic Sivaraam2017-08-17
| |/ /
* | | The fifth batch post 2.14Junio C Hamano2017-08-26
* | | Merge branch 'mg/killed-merge'Junio C Hamano2017-08-26
|\ \ \
| * | | merge: save merge state earlierMichael J Gruber2017-08-23
| * | | merge: split write_merge_state in twoMichael J Gruber2017-08-23
| * | | merge: clarify call chainMichael J Gruber2017-08-23
| * | | Documentation/git-merge: explain --continueMichael J Gruber2017-08-21
| | |/ | |/|
* | | Merge branch 'jt/packmigrate'Junio C Hamano2017-08-26
|\ \ \
| * | | pack: move for_each_packed_object()Jonathan Tan2017-08-23
| * | | pack: move has_pack_index()Jonathan Tan2017-08-23
| * | | pack: move has_sha1_pack()Jonathan Tan2017-08-23
| * | | pack: move find_pack_entry() and make it globalJonathan Tan2017-08-23
| * | | pack: move find_sha1_pack()Jonathan Tan2017-08-23
| * | | pack: move find_pack_entry_one(), is_pack_valid()Jonathan Tan2017-08-23
| * | | pack: move check_pack_index_ptr(), nth_packed_object_offset()Jonathan Tan2017-08-23
| * | | pack: move nth_packed_object_{sha1,oid}Jonathan Tan2017-08-23
| * | | pack: move clear_delta_base_cache(), packed_object_info(), unpack_entry()Jonathan Tan2017-08-23
| * | | pack: move unpack_object_header()Jonathan Tan2017-08-23
| * | | pack: move get_size_from_delta()Jonathan Tan2017-08-23
| * | | pack: move unpack_object_header_buffer()Jonathan Tan2017-08-23
| * | | pack: move {,re}prepare_packed_git and approximate_object_countJonathan Tan2017-08-23
| * | | pack: move install_packed_git()Jonathan Tan2017-08-23
| * | | pack: move add_packed_git()Jonathan Tan2017-08-23
| * | | pack: move unuse_pack()Jonathan Tan2017-08-23
| * | | pack: move use_pack()Jonathan Tan2017-08-23
| * | | pack: move pack-closing functionsJonathan Tan2017-08-23
| * | | pack: move release_pack_memory()Jonathan Tan2017-08-23
| * | | pack: move open_pack_index(), parse_pack_index()Jonathan Tan2017-08-23
| * | | pack: move pack_report()Jonathan Tan2017-08-23
| * | | pack: move static state variablesJonathan Tan2017-08-23
| * | | pack: move pack name-related functionsJonathan Tan2017-08-23
* | | | Merge branch 'mh/ref-lock-entry'Junio C Hamano2017-08-26
|\ \ \ \
| * | | | refs: retry acquiring reference locks for 100msMichael Haggerty2017-08-23
| | |/ / | |/| |
* | | | Merge branch 'jt/doc-pack-objects-fix'Junio C Hamano2017-08-26
|\ \ \ \
| * | | | Doc: clarify that pack-objects makes packs, pluralJonathan Tan2017-08-23