summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* khash: rename kh_oid_t to kh_oid_setJeff King2019-06-203-9/+9
* khash: drop broken oid_map typedefJeff King2019-06-202-3/+1
* object: convert create_object() to use object_idJeff King2019-06-207-13/+9
* object: convert internal hash_obj() to object_idJeff King2019-06-201-4/+4
* object: convert lookup_object() to use object_idJeff King2019-06-2016-31/+30
* object: convert lookup_unknown_object() to use object_idJeff King2019-06-2010-14/+14
* pack-objects: convert locate_object_entry_hash() to object_idJeff King2019-06-201-5/+5
* pack-objects: convert packlist_find() to use object_idJeff King2019-06-205-16/+17
* pack-bitmap-write: convert some helpers to use object_idJeff King2019-06-201-9/+9
* upload-pack: rename a "sha1" variable to "oid"Jeff King2019-06-201-3/+3
* describe: fix accidental oid/hash type-punningJeff King2019-06-201-1/+1
* The second batchJunio C Hamano2019-06-171-0/+77
* Merge branch 'xl/record-partial-clone-origin'Junio C Hamano2019-06-172-4/+14
|\
| * clone: respect user supplied origin name when setting up partial cloneXin Li2019-05-302-4/+14
* | Merge branch 'pb/request-pull-verify-remote-ref'Junio C Hamano2019-06-172-17/+82
|\ \
| * | request-pull: warn if the remote object is not the same as the local onePaolo Bonzini2019-05-282-15/+63
| * | request-pull: quote regex metacharacters in local refPaolo Bonzini2019-05-282-3/+20
* | | Merge branch 'mm/p4-unshelve-windows-fix'Junio C Hamano2019-06-171-1/+1
|\ \ \
| * | | p4 unshelve: fix "Not a valid object name HEAD0" on WindowsMike Mueller2019-05-281-1/+1
| |/ /
* | | Merge branch 'po/git-help-on-git-itself'Junio C Hamano2019-06-172-2/+4
|\ \ \
| * | | Doc: git.txt: remove backticks from link and add git-scm.com/docsPhilip Oakley2019-05-161-1/+2
| * | | git.c: show usage for accessing the git(1) help pagePhilip Oakley2019-05-161-1/+2
| |/ /
* | | Merge branch 'es/first-contrib-tutorial'Junio C Hamano2019-06-172-0/+1133
|\ \ \
| * | | doc: add some nit fixes to MyFirstContributionEmily Shaffer2019-05-291-4/+27
| * | | documentation: add anchors to MyFirstContributionEmily Shaffer2019-05-191-0/+35
| * | | documentation: add tutorial for first contributionEmily Shaffer2019-05-192-0/+1075
* | | | Merge branch 'bb/unicode-12.1-reiwa'Junio C Hamano2019-06-171-2/+1
|\ \ \ \
| * | | | unicode: update the width tables to Unicode 12.1Beat Bolli2019-05-291-2/+1
| | |/ / | |/| |
* | | | Merge branch 'sw/git-p4-unshelve-branched-files'Junio C Hamano2019-06-172-2/+8
|\ \ \ \
| * | | | git-p4: allow unshelving of branched filesSimon Williams2019-05-282-2/+8
| |/ / /
* | | | Merge branch 'js/fsmonitor-unflake'Junio C Hamano2019-06-178-13/+14
|\ \ \ \
| * | | | mark_fsmonitor_valid(): mark the index as changed if neededJohannes Schindelin2019-05-284-6/+7
| * | | | fill_stat_cache_info(): prepare for an fsmonitor fixJohannes Schindelin2019-05-285-7/+7
* | | | | Merge branch 'ds/topo-traversal-using-commit-graph'Junio C Hamano2019-06-171-1/+6
|\ \ \ \ \
| * | | | | revision: keep topo-walk free of unintersting commitsDerrick Stolee2019-05-281-0/+3
| * | | | | revision: use generation for A..B --topo-order queriesDerrick Stolee2019-05-281-1/+3
| | |_|_|/ | |/| | |
* | | | | Merge branch 'bl/userdiff-octave'Junio C Hamano2019-06-177-2/+25
|\ \ \ \ \
| * | | | | userdiff: fix grammar and style issuesBoxuan Li2019-05-292-3/+5
| * | | | | userdiff: add OctaveBoxuan Li2019-05-197-2/+23
* | | | | | Merge branch 'ba/clone-remote-submodules'Junio C Hamano2019-06-173-1/+70
|\ \ \ \ \ \
| * | | | | | clone: add `--remote-submodules` flagBen Avison2019-05-283-1/+70
| |/ / / / /
* | | | | | Merge branch 'vv/merge-squash-with-explicit-commit'Junio C Hamano2019-06-173-1/+19
|\ \ \ \ \ \
| * | | | | | merge: refuse --commit with --squashVishal Verma2019-05-283-1/+19
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'js/bundle-verify-require-object-store'Junio C Hamano2019-06-172-0/+9
|\ \ \ \ \ \
| * | | | | | bundle verify: error out if called without an object databaseJohannes Schindelin2019-05-282-0/+9
| |/ / / / /
* | | | | | Merge branch 'js/bisect-helper-check-get-oid-return-value'Junio C Hamano2019-06-171-1/+4
|\ \ \ \ \ \
| * | | | | | bisect--helper: verify HEAD could be parsed before continuingJohannes Schindelin2019-05-281-1/+4
| |/ / / / /
* | | | | | Merge branch 'jk/am-i-resolved-fix'Junio C Hamano2019-06-172-11/+64
|\ \ \ \ \ \
| * | | | | | am: fix --interactive HEAD tree resolutionJeff King2019-05-282-3/+56
| * | | | | | am: drop tty requirement for --interactiveJeff King2019-05-281-3/+3