Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/upload-pack-send-symref' into maint | Junio C Hamano | 2013-11-08 | 1 | -1/+0 |
|\ | |||||
| * | connect.c: make parse_feature_value() static | Junio C Hamano | 2013-09-17 | 1 | -1/+0 |
* | | Merge branch 'jk/format-patch-from' into maint | Junio C Hamano | 2013-10-28 | 1 | -0/+9 |
|\ \ | |/ |/| | |||||
| * | format-patch: print in-body "From" only when neededjk/format-patch-from | Jeff King | 2013-09-20 | 1 | -0/+9 |
* | | Merge branch 'ob/typofixes' | Junio C Hamano | 2013-08-01 | 1 | -1/+1 |
|\ \ | |||||
| * | | many small typofixesob/typofixes | Ondřej Bílka | 2013-07-29 | 1 | -1/+1 |
* | | | Merge branch 'jk/cat-file-batch-optim' | Junio C Hamano | 2013-07-24 | 1 | -0/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | sha1_object_info_extended: make type calculation optional | Jeff King | 2013-07-12 | 1 | -0/+1 |
| * | | cat-file: disable object/refname ambiguity check for batch mode | Jeff King | 2013-07-12 | 1 | -0/+1 |
* | | | Merge branch 'jx/clean-interactive' | Junio C Hamano | 2013-07-22 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | path.c: refactor relative_path(), not only strip prefix | Jiang Xin | 2013-06-26 | 1 | -1/+1 |
* | | | | Merge branch 'hv/config-from-blob' | Junio C Hamano | 2013-07-22 | 1 | -1/+5 |
|\ \ \ \ | |||||
| * | | | | teach config --blob option to parse config from database | Heiko Voigt | 2013-07-12 | 1 | -1/+5 |
| |/ / / | |||||
* | | | | Merge branch 'nd/const-struct-cache-entry' | Junio C Hamano | 2013-07-22 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entry | Nguyễn Thái Ngọc Duy | 2013-07-09 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'tr/protect-low-3-fds' | Junio C Hamano | 2013-07-22 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | daemon/shell: refactor redirection of 0/1/2 from /dev/null | Thomas Rast | 2013-07-17 | 1 | -0/+2 |
* | | | | | Merge branch 'jk/in-pack-size-measurement' | Junio C Hamano | 2013-07-18 | 1 | -0/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | teach sha1_object_info_extended a "disk_size" query | Jeff King | 2013-07-07 | 1 | -0/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'mh/ref-races' | Junio C Hamano | 2013-06-30 | 1 | -7/+53 |
|\ \ \ | |||||
| * | | | add a stat_validity struct | Michael Haggerty | 2013-06-20 | 1 | -0/+27 |
| * | | | Extract a struct stat_data from cache_entry | Michael Haggerty | 2013-06-20 | 1 | -7/+26 |
* | | | | Merge branch 'nd/traces' | Junio C Hamano | 2013-06-20 | 1 | -3/+0 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | core: use env variable instead of config var to turn on logging pack access | Nguyễn Thái Ngọc Duy | 2013-06-09 | 1 | -3/+0 |
| |/ / | |||||
* | | | 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 |