summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | builtin/replace: convert to struct object_idbrian m. carlson2017-02-221-56/+56
| * | | | | | | Convert remaining callers of resolve_refdup to object_idbrian m. carlson2017-02-226-23/+23
| * | | | | | | builtin/merge: convert to struct object_idbrian m. carlson2017-02-221-68/+66
| * | | | | | | builtin/clone: convert to struct object_idbrian m. carlson2017-02-221-5/+5
| * | | | | | | builtin/branch: convert to struct object_idbrian m. carlson2017-02-221-13/+13
| * | | | | | | builtin/grep: convert to struct object_idbrian m. carlson2017-02-221-12/+12
| * | | | | | | builtin/fmt-merge-message: convert to struct object_idbrian m. carlson2017-02-221-35/+35
| * | | | | | | builtin/fast-export: convert to struct object_idbrian m. carlson2017-02-221-29/+29
| * | | | | | | builtin/describe: convert to struct object_idbrian m. carlson2017-02-221-25/+25
| * | | | | | | builtin/diff-tree: convert to struct object_idbrian m. carlson2017-02-221-32/+31
| * | | | | | | builtin/commit: convert to struct object_idbrian m. carlson2017-02-201-23/+23
| * | | | | | | hex: introduce parse_oid_hexbrian m. carlson2017-02-202-0/+17
* | | | | | | | Merge branch 'rs/blame-code-cleanup'Junio C Hamano2017-03-171-17/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | blame: move blame_entry duplication to add_blame_entry()rs/blame-code-cleanupRené Scharfe2017-03-111-17/+8
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/interop-test'Junio C Hamano2017-03-178-1/+270
|\ \ \ \ \ \ \ \
| * | | | | | | | t/interop: add test of old clients against modern git-daemonjk/interop-testJeff King2017-03-102-1/+43
| * | | | | | | | t: add an interoperability test harnessJeff King2017-03-106-0/+227
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'cc/split-index-config'Junio C Hamano2017-03-1711-131/+540
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation/git-update-index: explain splitIndex.*Christian Couder2017-03-062-9/+30
| * | | | | | | | Documentation/config: add splitIndex.sharedIndexExpireChristian Couder2017-03-061-0/+12
| * | | | | | | | read-cache: use freshen_shared_index() in read_index_from()Christian Couder2017-03-062-7/+8
| * | | | | | | | read-cache: refactor read_index_from()Christian Couder2017-03-061-6/+8
| * | | | | | | | t1700: test shared index file expirationChristian Couder2017-03-061-0/+44
| * | | | | | | | read-cache: unlink old sharedindex filesChristian Couder2017-03-061-1/+63
| * | | | | | | | config: add git_config_get_expiry() from gc.cChristian Couder2017-03-013-13/+18
| * | | | | | | | read-cache: touch shared index files when usedChristian Couder2017-03-011-3/+26
| * | | | | | | | sha1_file: make check_and_freshen_file() non staticChristian Couder2017-03-012-1/+4
| * | | | | | | | Documentation/config: add splitIndex.maxPercentChangeChristian Couder2017-03-011-0/+13
| * | | | | | | | t1700: add tests for splitIndex.maxPercentChangeChristian Couder2017-03-011-0/+72
| * | | | | | | | read-cache: regenerate shared index if necessaryChristian Couder2017-03-012-0/+33
| * | | | | | | | config: add git_config_get_max_percent_split_change()Christian Couder2017-03-012-0/+16
| * | | | | | | | Documentation/git-update-index: talk about core.splitIndex config varChristian Couder2017-03-011-0/+6
| * | | | | | | | Documentation/config: add information for core.splitIndexChristian Couder2017-03-011-0/+4
| * | | | | | | | t1700: add tests for core.splitIndexChristian Couder2017-03-011-0/+37
| * | | | | | | | update-index: warn in case of split-index incoherencyChristian Couder2017-03-011-1/+10
| * | | | | | | | read-cache: add and then use tweak_split_index()Christian Couder2017-03-011-0/+17
| * | | | | | | | split-index: add {add,remove}_split_index() functionsChristian Couder2017-03-013-12/+30
| * | | | | | | | config: add git_config_get_split_index()Christian Couder2017-03-012-0/+11
| * | | | | | | | t1700: change here document styleChristian Couder2017-03-011-85/+85
| * | | | | | | | config: mark an error message up for translationChristian Couder2017-03-011-2/+2
* | | | | | | | | Sync with 'maint'Junio C Hamano2017-03-161-0/+41
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Preparing for 2.12.1Junio C Hamano2017-03-163-2/+43
| * | | | | | | | Merge branch 'js/realpath-pathdup-fix' into maintJunio C Hamano2017-03-1610-18/+26
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'mm/two-more-xstrfmt' into maintJunio C Hamano2017-03-162-11/+9
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'vn/line-log-memcpy-size-fix' into maintJunio C Hamano2017-03-161-1/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ax/line-log-range-merge-fix' into maintJunio C Hamano2017-03-162-8/+17
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/add-i-patch-do-prompt' into maintJunio C Hamano2017-03-162-4/+22
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jt/http-base-url-update-upon-redirect' into maintJunio C Hamano2017-03-163-0/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/travis-32bit-linux' into maintJunio C Hamano2017-03-162-0/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jh/mingw-openssl-sha1' into maintJunio C Hamano2017-03-161-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \