summaryrefslogtreecommitdiff
path: root/cache.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'lf/read-blob-data-from-index'Junio C Hamano2013-04-211-0/+2
|\
| * read_blob_data_from_index(): optionally return the size of blob dataLukas Fleischer2013-04-171-2/+2
| * attr.c: extract read_index_data() as read_blob_data_from_index()Lukas Fleischer2013-04-171-0/+2
| * Merge branch 'kb/name-hash' into maint-1.8.1Junio C Hamano2013-04-031-14/+3
| |\
* | \ Merge branch 'jn/add-2.0-u-A-sans-pathspec' (early part)Junio C Hamano2013-04-191-0/+1
|\ \ \
| * | | add -u: only show pathless 'add -u' warning when changes exist outside cwdJonathan Nieder2013-04-031-0/+1
* | | | Merge branch 'tb/shared-perm'Junio C Hamano2013-04-071-2/+1
|\ \ \ \
| * | | | path.c: simplify adjust_shared_perm()Torsten Bögershausen2013-04-051-2/+1
* | | | | Merge branch 'nd/checkout-paths-reduce-match-pathspec-calls'Junio C Hamano2013-04-031-0/+3
|\ \ \ \ \
| * | | | | checkout: avoid unnecessary match_pathspec callsNguyễn Thái Ngọc Duy2013-03-271-0/+3
| |/ / / /
* | | | | Merge branch 'kb/name-hash'Junio C Hamano2013-04-011-14/+3
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | name-hash.c: fix endless loop with core.ignorecase=trueKarsten Blees2013-02-271-14/+3
* | | | | Merge branch 'jk/pkt-line-cleanup'Junio C Hamano2013-04-011-1/+3
|\ \ \ \ \
| * | | | | teach get_remote_heads to read from a memory bufferJeff King2013-02-241-1/+3
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs/archive-zip-raw-compression'Junio C Hamano2013-03-271-0/+1
|\ \ \ \ \
| * | | | | archive-zip: use deflateInit2() to ask for raw compressed dataRené Scharfe2013-03-161-0/+1
* | | | | | Merge branch 'jk/alias-in-bare'Junio C Hamano2013-03-251-6/+19
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | setup: suppress implicit "." work-tree for bare reposJeff King2013-03-081-0/+12
| * | | | | environment: add GIT_PREFIX to local_repo_envJeff King2013-03-081-0/+1
| * | | | | cache.h: drop LOCAL_REPO_ENV_SIZEJeff King2013-03-081-6/+6
| | |_|_|/ | |/| | |
| * | | | Merge branch 'mh/ceiling' into maintJunio C Hamano2013-01-281-1/+2
| |\ \ \ \
* | \ \ \ \ Merge branch 'nd/count-garbage'Junio C Hamano2013-03-211-0/+3
|\ \ \ \ \ \
| * | | | | | count-objects: report garbage files in pack directory tooNguyễn Thái Ngọc Duy2013-02-151-0/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jc/fetch-raw-sha1'Junio C Hamano2013-03-211-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fetch: use struct ref to represent refs to be fetchedJunio C Hamano2013-02-071-1/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'jc/push-reject-reasons'Junio C Hamano2013-02-041-3/+3
|\ \ \ \ \
| * | | | | push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCEJunio C Hamano2013-01-241-0/+2
| * | | | | push: further clean up fields of "struct ref"Junio C Hamano2013-01-241-3/+1
* | | | | | Merge branch 'jk/config-parsing-cleanup'Junio C Hamano2013-02-041-0/+15
|\ \ \ \ \ \
| * | | | | | config: add helper function for parsing key namesJeff King2013-01-231-0/+15
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jc/custom-comment-char'Junio C Hamano2013-02-041-0/+6
|\ \ \ \ \ \
| * | | | | | Allow custom "comment char"Junio C Hamano2013-01-161-0/+6
| |/ / / / /
* | | | | | Merge branch 'rr/minimal-stat'Junio C Hamano2013-01-301-0/+1
|\ \ \ \ \ \
| * | | | | | Enable minimal stat checkingRobin Rosenberg2013-01-221-0/+1
| |/ / / / /
* | | | | | Merge branch 'jk/suppress-clang-warning'Junio C Hamano2013-01-231-1/+1
|\ \ \ \ \ \
| * | | | | | fix clang -Wunused-value warnings for error functionsMax Horn2013-01-161-1/+1
* | | | | | | Merge branch 'cr/push-force-tag-update'Junio C Hamano2013-01-231-1/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | push: fix "refs/tags/ hierarchy cannot be updated without --force"Junio C Hamano2013-01-161-1/+0
* | | | | | Merge branch 'jk/pathspec-literal'Junio C Hamano2013-01-051-0/+3
|\ \ \ \ \ \
| * | | | | | add global --literal-pathspecs optionJeff King2012-12-191-0/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jk/error-const-return'Junio C Hamano2013-01-051-0/+3
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | silence some -Wuninitialized false positivesJeff King2012-12-151-0/+3
| |/ / / /
* | | | | Merge branch 'jk/mailmap-from-blob'Junio C Hamano2013-01-051-0/+1
|\ \ \ \ \
| * | | | | mailmap: support reading mailmap from blobsJeff King2012-12-121-0/+1
| |/ / / /
* | | | | Merge branch 'cr/push-force-tag-update'Junio C Hamano2013-01-051-1/+6
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | push: require force for refs under refs/tags/Chris Rorvick2012-12-021-0/+1
| * | | | push: flag updates that require forceChris Rorvick2012-12-021-1/+3
| * | | | push: keep track of "update" state separatelyChris Rorvick2012-12-021-0/+1
| * | | | push: add advice for rejected tag referenceChris Rorvick2012-12-021-0/+1
* | | | | Merge branch 'nd/pathspec-wildcard'Junio C Hamano2013-01-051-1/+4
|\ \ \ \ \