Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs/unpack-trees-plug-leak' | Junio C Hamano | 2013-06-11 | 1 | -4/+6 |
|\ | |||||
| * | read-cache: mark cache_entry pointers const | René Scharfe | 2013-06-02 | 1 | -2/+2 |
| * | cache: mark cache_entry pointers const | René Scharfe | 2013-06-02 | 1 | -2/+4 |
* | | Merge branch 'jk/fetch-always-update-tracking' | Junio C Hamano | 2013-06-02 | 1 | -1/+13 |
|\ \ | |||||
| * | | refactor "ref->merge" flag | Jeff King | 2013-05-12 | 1 | -1/+13 |
| |/ | |||||
* | | Merge branch 'jc/prune-all' | Junio C Hamano | 2013-05-29 | 1 | -0/+1 |
|\ \ | |/ |/| | |||||
| * | date.c: add parse_expiry_date() | Junio C Hamano | 2013-04-17 | 1 | -0/+1 |
* | | Merge branch 'lf/read-blob-data-from-index' | Junio C Hamano | 2013-04-21 | 1 | -0/+2 |
|\ \ | |||||
| * | | read_blob_data_from_index(): optionally return the size of blob data | Lukas Fleischer | 2013-04-17 | 1 | -2/+2 |
| * | | attr.c: extract read_index_data() as read_blob_data_from_index() | Lukas Fleischer | 2013-04-17 | 1 | -0/+2 |
| |/ | |||||
| * | Merge branch 'kb/name-hash' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 1 | -14/+3 |
| |\ | |||||
* | \ | Merge branch 'jn/add-2.0-u-A-sans-pathspec' (early part) | Junio C Hamano | 2013-04-19 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | add -u: only show pathless 'add -u' warning when changes exist outside cwd | Jonathan Nieder | 2013-04-03 | 1 | -0/+1 |
* | | | | Merge branch 'tb/shared-perm' | Junio C Hamano | 2013-04-07 | 1 | -2/+1 |
|\ \ \ \ | |||||
| * | | | | path.c: simplify adjust_shared_perm() | Torsten Bögershausen | 2013-04-05 | 1 | -2/+1 |
* | | | | | Merge branch 'nd/checkout-paths-reduce-match-pathspec-calls' | Junio C Hamano | 2013-04-03 | 1 | -0/+3 |
|\ \ \ \ \ | |||||
| * | | | | | checkout: avoid unnecessary match_pathspec calls | Nguyễn Thái Ngọc Duy | 2013-03-27 | 1 | -0/+3 |
| |/ / / / | |||||
* | | | | | Merge branch 'kb/name-hash' | Junio C Hamano | 2013-04-01 | 1 | -14/+3 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | name-hash.c: fix endless loop with core.ignorecase=true | Karsten Blees | 2013-02-27 | 1 | -14/+3 |
* | | | | | Merge branch 'jk/pkt-line-cleanup' | Junio C Hamano | 2013-04-01 | 1 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | teach get_remote_heads to read from a memory buffer | Jeff King | 2013-02-24 | 1 | -1/+3 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'rs/archive-zip-raw-compression' | Junio C Hamano | 2013-03-27 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | archive-zip: use deflateInit2() to ask for raw compressed data | René Scharfe | 2013-03-16 | 1 | -0/+1 |
* | | | | | | Merge branch 'jk/alias-in-bare' | Junio C Hamano | 2013-03-25 | 1 | -6/+19 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | setup: suppress implicit "." work-tree for bare repos | Jeff King | 2013-03-08 | 1 | -0/+12 |
| * | | | | | environment: add GIT_PREFIX to local_repo_env | Jeff King | 2013-03-08 | 1 | -0/+1 |
| * | | | | | cache.h: drop LOCAL_REPO_ENV_SIZE | Jeff King | 2013-03-08 | 1 | -6/+6 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'mh/ceiling' into maint | Junio C Hamano | 2013-01-28 | 1 | -1/+2 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'nd/count-garbage' | Junio C Hamano | 2013-03-21 | 1 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | count-objects: report garbage files in pack directory too | Nguyễn Thái Ngọc Duy | 2013-02-15 | 1 | -0/+3 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'jc/fetch-raw-sha1' | Junio C Hamano | 2013-03-21 | 1 | -1/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | fetch: use struct ref to represent refs to be fetched | Junio C Hamano | 2013-02-07 | 1 | -1/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'jc/push-reject-reasons' | Junio C Hamano | 2013-02-04 | 1 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE | Junio C Hamano | 2013-01-24 | 1 | -0/+2 |
| * | | | | | push: further clean up fields of "struct ref" | Junio C Hamano | 2013-01-24 | 1 | -3/+1 |
* | | | | | | Merge branch 'jk/config-parsing-cleanup' | Junio C Hamano | 2013-02-04 | 1 | -0/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | config: add helper function for parsing key names | Jeff King | 2013-01-23 | 1 | -0/+15 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'jc/custom-comment-char' | Junio C Hamano | 2013-02-04 | 1 | -0/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Allow custom "comment char" | Junio C Hamano | 2013-01-16 | 1 | -0/+6 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'rr/minimal-stat' | Junio C Hamano | 2013-01-30 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Enable minimal stat checking | Robin Rosenberg | 2013-01-22 | 1 | -0/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jk/suppress-clang-warning' | Junio C Hamano | 2013-01-23 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix clang -Wunused-value warnings for error functions | Max Horn | 2013-01-16 | 1 | -1/+1 |
* | | | | | | | Merge branch 'cr/push-force-tag-update' | Junio C Hamano | 2013-01-23 | 1 | -1/+0 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | | | |||||
| * | | | | | push: fix "refs/tags/ hierarchy cannot be updated without --force" | Junio C Hamano | 2013-01-16 | 1 | -1/+0 |
* | | | | | | Merge branch 'jk/pathspec-literal' | Junio C Hamano | 2013-01-05 | 1 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add global --literal-pathspecs option | Jeff King | 2012-12-19 | 1 | -0/+3 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'jk/error-const-return' | Junio C Hamano | 2013-01-05 | 1 | -0/+3 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | silence some -Wuninitialized false positives | Jeff King | 2012-12-15 | 1 | -0/+3 |
| |/ / / / | |||||
* | | | | | Merge branch 'jk/mailmap-from-blob' | Junio C Hamano | 2013-01-05 | 1 | -0/+1 |
|\ \ \ \ \ |