Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | builtin/diff-tree: convert to struct object_id | brian m. carlson | 2017-02-22 | 1 | -32/+31 | |
| * | | | | | builtin/commit: convert to struct object_id | brian m. carlson | 2017-02-20 | 1 | -23/+23 | |
| * | | | | | hex: introduce parse_oid_hex | brian m. carlson | 2017-02-20 | 2 | -0/+17 | |
* | | | | | | Merge branch 'rs/blame-code-cleanup' | Junio C Hamano | 2017-03-17 | 1 | -17/+8 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | blame: move blame_entry duplication to add_blame_entry()rs/blame-code-cleanup | René Scharfe | 2017-03-11 | 1 | -17/+8 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge branch 'jk/interop-test' | Junio C Hamano | 2017-03-17 | 8 | -1/+270 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | t/interop: add test of old clients against modern git-daemonjk/interop-test | Jeff King | 2017-03-10 | 2 | -1/+43 | |
| * | | | | | | t: add an interoperability test harness | Jeff King | 2017-03-10 | 6 | -0/+227 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge branch 'cc/split-index-config' | Junio C Hamano | 2017-03-17 | 11 | -131/+540 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Documentation/git-update-index: explain splitIndex.* | Christian Couder | 2017-03-06 | 2 | -9/+30 | |
| * | | | | | | Documentation/config: add splitIndex.sharedIndexExpire | Christian Couder | 2017-03-06 | 1 | -0/+12 | |
| * | | | | | | read-cache: use freshen_shared_index() in read_index_from() | Christian Couder | 2017-03-06 | 2 | -7/+8 | |
| * | | | | | | read-cache: refactor read_index_from() | Christian Couder | 2017-03-06 | 1 | -6/+8 | |
| * | | | | | | t1700: test shared index file expiration | Christian Couder | 2017-03-06 | 1 | -0/+44 | |
| * | | | | | | read-cache: unlink old sharedindex files | Christian Couder | 2017-03-06 | 1 | -1/+63 | |
| * | | | | | | config: add git_config_get_expiry() from gc.c | Christian Couder | 2017-03-01 | 3 | -13/+18 | |
| * | | | | | | read-cache: touch shared index files when used | Christian Couder | 2017-03-01 | 1 | -3/+26 | |
| * | | | | | | sha1_file: make check_and_freshen_file() non static | Christian Couder | 2017-03-01 | 2 | -1/+4 | |
| * | | | | | | Documentation/config: add splitIndex.maxPercentChange | Christian Couder | 2017-03-01 | 1 | -0/+13 | |
| * | | | | | | t1700: add tests for splitIndex.maxPercentChange | Christian Couder | 2017-03-01 | 1 | -0/+72 | |
| * | | | | | | read-cache: regenerate shared index if necessary | Christian Couder | 2017-03-01 | 2 | -0/+33 | |
| * | | | | | | config: add git_config_get_max_percent_split_change() | Christian Couder | 2017-03-01 | 2 | -0/+16 | |
| * | | | | | | Documentation/git-update-index: talk about core.splitIndex config var | Christian Couder | 2017-03-01 | 1 | -0/+6 | |
| * | | | | | | Documentation/config: add information for core.splitIndex | Christian Couder | 2017-03-01 | 1 | -0/+4 | |
| * | | | | | | t1700: add tests for core.splitIndex | Christian Couder | 2017-03-01 | 1 | -0/+37 | |
| * | | | | | | update-index: warn in case of split-index incoherency | Christian Couder | 2017-03-01 | 1 | -1/+10 | |
| * | | | | | | read-cache: add and then use tweak_split_index() | Christian Couder | 2017-03-01 | 1 | -0/+17 | |
| * | | | | | | split-index: add {add,remove}_split_index() functions | Christian Couder | 2017-03-01 | 3 | -12/+30 | |
| * | | | | | | config: add git_config_get_split_index() | Christian Couder | 2017-03-01 | 2 | -0/+11 | |
| * | | | | | | t1700: change here document style | Christian Couder | 2017-03-01 | 1 | -85/+85 | |
| * | | | | | | config: mark an error message up for translation | Christian Couder | 2017-03-01 | 1 | -2/+2 | |
* | | | | | | | Sync with 'maint' | Junio C Hamano | 2017-03-16 | 1 | -0/+41 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Preparing for 2.12.1 | Junio C Hamano | 2017-03-16 | 3 | -2/+43 | |
| * | | | | | | | Merge branch 'js/realpath-pathdup-fix' into maint | Junio C Hamano | 2017-03-16 | 10 | -18/+26 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'mm/two-more-xstrfmt' into maint | Junio C Hamano | 2017-03-16 | 2 | -11/+9 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'vn/line-log-memcpy-size-fix' into maint | Junio C Hamano | 2017-03-16 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'ax/line-log-range-merge-fix' into maint | Junio C Hamano | 2017-03-16 | 2 | -8/+17 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/add-i-patch-do-prompt' into maint | Junio C Hamano | 2017-03-16 | 2 | -4/+22 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jt/http-base-url-update-upon-redirect' into maint | Junio C Hamano | 2017-03-16 | 3 | -0/+21 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/travis-32bit-linux' into maint | Junio C Hamano | 2017-03-16 | 2 | -0/+51 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jh/mingw-openssl-sha1' into maint | Junio C Hamano | 2017-03-16 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/http-auth' into maint | Junio C Hamano | 2017-03-16 | 1 | -4/+46 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Fourth batch after 2.12 | Junio C Hamano | 2017-03-14 | 1 | -0/+42 | |
* | | | | | | | | | | | | | | | | Merge branch 'kn/ref-filter-branch-list' | Junio C Hamano | 2017-03-14 | 2 | -4/+40 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | branch: honor --abbrev/--no-abbrev in --list mode | Junio C Hamano | 2017-03-10 | 2 | -4/+40 | |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/push-deadlock-regression-fix' | Junio C Hamano | 2017-03-14 | 2 | -11/+40 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | send-pack: report signal death of pack-objectsjk/push-deadlock-regression-fix | Jeff King | 2017-03-07 | 1 | -1/+14 | |
| * | | | | | | | | | | | | | | | | | send-pack: read "unpack" status even on pack-objects failure | Jeff King | 2017-03-07 | 1 | -0/+8 | |
| * | | | | | | | | | | | | | | | | | send-pack: improve unpack-status error messages | Jeff King | 2017-03-07 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | send-pack: use skip_prefix for parsing unpack status | Jeff King | 2017-03-07 | 1 | -3/+3 |