Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bw/c-plus-plus' | Junio C Hamano | 2018-03-06 | 1 | -2/+2 |
|\ | |||||
| * | environment: rename 'template' variables | Brandon Williams | 2018-02-22 | 1 | -1/+1 |
| * | object_info: change member name from 'typename' to 'type_name' | Brandon Williams | 2018-02-14 | 1 | -1/+1 |
* | | Merge branch 'bc/hash-algo' | Junio C Hamano | 2018-02-15 | 1 | -25/+0 |
|\ \ | |||||
| * | | hash: move SHA-1 macros to hash.h | brian m. carlson | 2018-02-02 | 1 | -25/+0 |
| |/ | |||||
* | | Merge branch 'po/object-id' | Junio C Hamano | 2018-02-15 | 1 | -8/+17 |
|\ \ | |||||
| * | | sha1_file: rename hash_sha1_file_literallypo/object-id | Patryk Obara | 2018-01-30 | 1 | -1/+3 |
| * | | sha1_file: convert force_object_loose to object_id | Patryk Obara | 2018-01-30 | 1 | -1/+2 |
| * | | sha1_file: convert write_sha1_file to object_id | Patryk Obara | 2018-01-30 | 1 | -1/+3 |
| * | | cache: clear whole hash buffer with oidclr | Patryk Obara | 2018-01-30 | 1 | -1/+1 |
| * | | sha1_file: convert hash_sha1_file to object_id | Patryk Obara | 2018-01-30 | 1 | -1/+4 |
| * | | dir: convert struct sha1_stat to use object_id | Patryk Obara | 2018-01-30 | 1 | -2/+0 |
| * | | sha1_file: convert pretend_sha1_file to object_id | Patryk Obara | 2018-01-30 | 1 | -1/+4 |
| |/ | |||||
* | | Merge branch 'tg/split-index-fixes' | Junio C Hamano | 2018-02-13 | 1 | -3/+5 |
|\ \ | |||||
| * | | split-index: don't write cache tree with null oid entries | Thomas Gummerer | 2018-01-19 | 1 | -1/+2 |
| * | | read-cache: fix reading the shared index for other repos | Thomas Gummerer | 2018-01-19 | 1 | -2/+3 |
* | | | Merge branch 'cc/sha1-file-name' | Junio C Hamano | 2018-02-13 | 1 | -5/+3 |
|\ \ \ | |||||
| * | | | sha1_file: remove static strbuf from sha1_file_name() | Christian Couder | 2018-01-17 | 1 | -5/+3 |
| |/ / | |||||
* | | | Merge branch 'gs/retire-mru' | Junio C Hamano | 2018-02-13 | 1 | -4/+4 |
|\ \ \ | |||||
| * | | | mru: Replace mru.[ch] with list.h implementationgs/retire-mru | Gargi Sharma | 2018-01-24 | 1 | -4/+4 |
* | | | | Merge branch 'jh/partial-clone' | Junio C Hamano | 2018-02-13 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | partial-clone: define partial clone settings in config | Jeff Hostetler | 2017-12-08 | 1 | -0/+1 |
* | | | | | Merge branch 'jh/fsck-promisors' | Junio C Hamano | 2018-02-13 | 1 | -1/+12 |
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | |||||
| * | | | sha1_file: support lazily fetching missing objects | Jonathan Tan | 2017-12-08 | 1 | -0/+8 |
| * | | | fsck: introduce partialclone extension | Jonathan Tan | 2017-12-05 | 1 | -1/+2 |
| * | | | extension.partialclone: introduce partial clone extension | Jonathan Tan | 2017-12-05 | 1 | -0/+2 |
| | |/ | |/| | |||||
* | | | Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with... | Junio C Hamano | 2017-12-22 | 1 | -0/+9 |
|\ \ \ | |||||
| * | | | move index_has_changes() from builtin/am.c to merge.c for reuse | Elijah Newren | 2017-12-22 | 1 | -0/+9 |
| |/ / | |||||
* | | | Merge branch 'ls/editor-waiting-message' | Junio C Hamano | 2017-12-19 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | refactor "dumb" terminal determination | Lars Schneider | 2017-12-04 | 1 | -0/+1 |
| |/ / | |||||
* | | | Merge branch 'ar/unconfuse-three-dots' | Junio C Hamano | 2017-12-19 | 1 | -0/+6 |
|\ \ \ | |||||
| * | | | print_sha1_ellipsis: introduce helper | Ann T Ropea | 2017-12-04 | 1 | -0/+6 |
* | | | | Merge branch 'bc/hash-algo' | Junio C Hamano | 2017-12-13 | 1 | -4/+8 |
|\ \ \ \ | |||||
| * | | | | Switch empty tree and blob lookups to use hash abstraction | brian m. carlson | 2017-11-13 | 1 | -4/+4 |
| * | | | | Integrate hash algorithm support with repo setup | brian m. carlson | 2017-11-13 | 1 | -0/+4 |
* | | | | | Merge branch 'bw/protocol-v1' | Junio C Hamano | 2017-12-06 | 1 | -0/+10 |
|\ \ \ \ \ | |||||
| * | | | | | http: tell server that the client understands v1 | Brandon Williams | 2017-10-17 | 1 | -0/+2 |
| * | | | | | protocol: introduce protocol extension mechanisms | Brandon Williams | 2017-10-17 | 1 | -0/+8 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'tb/add-renormalize' | Junio C Hamano | 2017-11-27 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | add: introduce "--renormalize"tb/add-renormalize | Torsten Bögershausen | 2017-11-17 | 1 | -0/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'av/fsmonitor' | Junio C Hamano | 2017-11-21 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | fsmonitor: delay updating state until after split index is merged | Alex Vandiver | 2017-11-01 | 1 | -0/+1 |
* | | | | | | Merge branch 'bp/fsmonitor' | Junio C Hamano | 2017-11-21 | 1 | -2/+8 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | fsmonitor: teach git to optionally utilize a file system monitor to speed up ... | Ben Peart | 2017-10-01 | 1 | -2/+8 |
* | | | | | | Merge branch 'bp/read-index-from-skip-verification' | Junio C Hamano | 2017-11-15 | 1 | -0/+1 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | read_index_from(): speed index loading by skipping verification of the entry ...bp/read-index-from-skip-verification | Ben Peart | 2017-11-08 | 1 | -0/+1 |
* | | | | | | Merge branch 'rs/hex-to-bytes-cleanup' | Junio C Hamano | 2017-11-09 | 1 | -0/+7 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | notes: move hex_to_bytes() to hex.c and export it | René Scharfe | 2017-11-01 | 1 | -0/+7 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'ma/lockfile-fixes' | Junio C Hamano | 2017-11-06 | 1 | -1/+24 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | read_cache: roll back lock in `update_index_if_able()`ma/lockfile-fixes | Martin Ågren | 2017-10-07 | 1 | -0/+4 |