Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| * | | | | read-cache: leave lock in right state in `write_locked_index()` | Martin Ågren | 2017-10-07 | 1 | -0/+4 |
| * | | | | read-cache: drop explicit `CLOSE_LOCK`-flag | Martin Ågren | 2017-10-07 | 1 | -3/+2 |
| * | | | | cache.h: document `write_locked_index()` | Martin Ågren | 2017-10-06 | 1 | -0/+16 |
* | | | | | Merge branch 'jk/no-optional-locks' | Junio C Hamano | 2017-10-03 | 1 | -0/+6 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | git: add --no-optional-locks option | Jeff King | 2017-09-27 | 1 | -0/+6 |
* | | | | | Merge branch 'rj/no-sign-compare' | Junio C Hamano | 2017-09-29 | 1 | -2/+2 |
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | | |||||
| * | | | cache.h: hex2chr() - avoid -Wsign-compare warnings | Ramsay Jones | 2017-09-22 | 1 | -2/+2 |
| |/ / | |||||
| * | | Merge branch 'sb/sha1-file-cleanup' into maint | Junio C Hamano | 2017-09-10 | 1 | -1/+0 |
| |\ \ | |||||
| * \ \ | Merge branch 'jk/hashcmp-memcmp' into maint | Junio C Hamano | 2017-09-10 | 1 | -8/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jt/subprocess-handshake' into maint | Junio C Hamano | 2017-08-23 | 1 | -0/+3 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshake | Junio C Hamano | 2017-07-26 | 1 | -0/+3 |
| | |\ \ \ \ | |||||
* | | | | | | | pack: make packed_git_mru global a value instead of a pointer | Jonathan Nieder | 2017-09-14 | 1 | -2/+2 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge branch 'jt/packmigrate' | Junio C Hamano | 2017-08-26 | 1 | -121/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | pack: move for_each_packed_object() | Jonathan Tan | 2017-08-23 | 1 | -6/+1 |
| * | | | | | | pack: move has_pack_index() | Jonathan Tan | 2017-08-23 | 1 | -2/+0 |
| * | | | | | | pack: move has_sha1_pack() | Jonathan Tan | 2017-08-23 | 1 | -2/+0 |
| * | | | | | | pack: move find_sha1_pack() | Jonathan Tan | 2017-08-23 | 1 | -3/+0 |
| * | | | | | | pack: move find_pack_entry_one(), is_pack_valid() | Jonathan Tan | 2017-08-23 | 1 | -8/+0 |
| * | | | | | | pack: move check_pack_index_ptr(), nth_packed_object_offset() | Jonathan Tan | 2017-08-23 | 1 | -16/+0 |
| * | | | | | | pack: move nth_packed_object_{sha1,oid} | Jonathan Tan | 2017-08-23 | 1 | -14/+0 |
| * | | | | | | pack: move clear_delta_base_cache(), packed_object_info(), unpack_entry() | Jonathan Tan | 2017-08-23 | 1 | -7/+0 |
| * | | | | | | pack: move unpack_object_header() | Jonathan Tan | 2017-08-23 | 1 | -1/+0 |
| * | | | | | | pack: move get_size_from_delta() | Jonathan Tan | 2017-08-23 | 1 | -1/+0 |
| * | | | | | | pack: move unpack_object_header_buffer() | Jonathan Tan | 2017-08-23 | 1 | -1/+0 |
| * | | | | | | pack: move {,re}prepare_packed_git and approximate_object_count | Jonathan Tan | 2017-08-23 | 1 | -15/+0 |
| * | | | | | | pack: move install_packed_git() | Jonathan Tan | 2017-08-23 | 1 | -1/+0 |