summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | Merge branch 'jk/replace-edit-raw'Junio C Hamano2014-07-162-10/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | replace: add a --raw mode for --editjk/replace-edit-rawJeff King2014-06-252-10/+29
* | | | | | | | | | | | | | | | | | Merge branch 'cc/replace-edit'Junio C Hamano2014-07-162-9/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | replace: use argv_array in export_objectcc/replace-editJeff King2014-06-251-3/+5
| * | | | | | | | | | | | | | | | | avoid double close of descriptors handed to run_commandJeff King2014-06-252-3/+0
| * | | | | | | | | | | | | | | | | replace: replace spaces with tabs in indentationJeff King2014-06-251-3/+3
* | | | | | | | | | | | | | | | | | Merge branch 'tb/crlf-tests'Junio C Hamano2014-07-162-61/+326
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | t0027: combinations of core.autocrlf, core.eol and textTorsten Bögershausen2014-07-081-0/+265
| * | | | | | | | | | | | | | | | | | t0025: rename the test filesTorsten Bögershausen2014-07-081-61/+61
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'nd/split-index'Junio C Hamano2014-07-1641-193/+1088
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | t1700: new tests for split-index modeNguyễn Thái Ngọc Duy2014-06-136-2/+233
| * | | | | | | | | | | | | | | | | | t2104: make sure split index mode is off for the version testNguyễn Thái Ngọc Duy2014-06-131-0/+2
| * | | | | | | | | | | | | | | | | | read-cache: force split index mode with GIT_TEST_SPLIT_INDEXNguyễn Thái Ngọc Duy2014-06-131-1/+9
| * | | | | | | | | | | | | | | | | | read-tree: note about dropping split-index mode or index versionNguyễn Thái Ngọc Duy2014-06-131-0/+9
| * | | | | | | | | | | | | | | | | | read-tree: force split-index mode off on --index-outputNguyễn Thái Ngọc Duy2014-06-131-1/+2
| * | | | | | | | | | | | | | | | | | rev-parse: add --shared-index-path to get shared index pathNguyễn Thái Ngọc Duy2014-06-132-0/+14
| * | | | | | | | | | | | | | | | | | update-index --split-index: do not split if $GIT_DIR is read onlyNguyễn Thái Ngọc Duy2014-06-131-3/+10
| * | | | | | | | | | | | | | | | | | update-index: new options to enable/disable split index modeNguyễn Thái Ngọc Duy2014-06-135-6/+114
| * | | | | | | | | | | | | | | | | | split-index: strip pathname of on-disk replaced entriesNguyễn Thái Ngọc Duy2014-06-133-2/+23
| * | | | | | | | | | | | | | | | | | split-index: do not invalidate cache-tree at read timeNguyễn Thái Ngọc Duy2014-06-133-1/+4
| * | | | | | | | | | | | | | | | | | split-index: the reading partNguyễn Thái Ngọc Duy2014-06-133-4/+84
| * | | | | | | | | | | | | | | | | | split-index: the writing partNguyễn Thái Ngọc Duy2014-06-132-2/+103
| * | | | | | | | | | | | | | | | | | read-cache: mark updated entries for split indexNguyễn Thái Ngọc Duy2014-06-137-2/+30
| * | | | | | | | | | | | | | | | | | read-cache: save deleted entries in split indexNguyễn Thái Ngọc Duy2014-06-133-6/+21
| * | | | | | | | | | | | | | | | | | read-cache: mark new entries for split indexNguyễn Thái Ngọc Duy2014-06-131-1/+2
| * | | | | | | | | | | | | | | | | | read-cache: split-index modeNguyễn Thái Ngọc Duy2014-06-138-5/+253
| * | | | | | | | | | | | | | | | | | read-cache: save index SHA-1 after readingNguyễn Thái Ngọc Duy2014-06-133-2/+6
| * | | | | | | | | | | | | | | | | | entry.c: update cache_changed if refresh_cache is set in checkout_entry()Nguyễn Thái Ngọc Duy2014-06-136-3/+11
| * | | | | | | | | | | | | | | | | | cache-tree: mark istate->cache_changed on prime_cache_tree()Nguyễn Thái Ngọc Duy2014-06-134-7/+8
| * | | | | | | | | | | | | | | | | | cache-tree: mark istate->cache_changed on cache tree updateNguyễn Thái Ngọc Duy2014-06-135-24/+18
| * | | | | | | | | | | | | | | | | | cache-tree: mark istate->cache_changed on cache tree invalidationNguyễn Thái Ngọc Duy2014-06-137-12/+20
| * | | | | | | | | | | | | | | | | | unpack-trees: be specific what part of the index has changedNguyễn Thái Ngọc Duy2014-06-131-2/+6
| * | | | | | | | | | | | | | | | | | resolve-undo: be specific what part of the index has changedNguyễn Thái Ngọc Duy2014-06-132-1/+2
| * | | | | | | | | | | | | | | | | | update-index: be specific what part of the index has changedNguyễn Thái Ngọc Duy2014-06-131-3/+3
| * | | | | | | | | | | | | | | | | | read-cache: be specific what part of the index has changedNguyễn Thái Ngọc Duy2014-06-134-9/+15
| * | | | | | | | | | | | | | | | | | read-cache: be strict about "changed" in remove_marked_cache_entries()Nguyễn Thái Ngọc Duy2014-06-131-0/+2
| * | | | | | | | | | | | | | | | | | read-cache: store in-memory flags in the first 12 bits of ce_flagsNguyễn Thái Ngọc Duy2014-06-132-2/+2
| * | | | | | | | | | | | | | | | | | read-cache: relocate and unexport commit_locked_index()Nguyễn Thái Ngọc Duy2014-06-133-21/+20
| * | | | | | | | | | | | | | | | | | read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy2014-06-1320-93/+86
| * | | | | | | | | | | | | | | | | | sequencer: do not update/refresh index if the lock cannot be heldNguyễn Thái Ngọc Duy2014-04-291-1/+1
| * | | | | | | | | | | | | | | | | | ewah: delete unused ewah_read_mmap_native declarationNguyễn Thái Ngọc Duy2014-04-291-1/+0
| * | | | | | | | | | | | | | | | | | ewah: fix constness of ewah_read_mmapNguyễn Thái Ngọc Duy2014-04-292-3/+3
* | | | | | | | | | | | | | | | | | | MinGW: fix compile error due to missing ELOOPKarsten Blees2014-07-161-0/+3
* | | | | | | | | | | | | | | | | | | .gitignore: "git-verify-commit" is a generated fileØyvind A. Holm2014-07-151-0/+1
* | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2014-07-101-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Start preparing for 2.0.2Junio C Hamano2014-07-102-1/+14
| * | | | | | | | | | | | | | | | | | Merge branch 'pb/trim-trailing-spaces' into maintJunio C Hamano2014-07-102-15/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/repack-pack-keep-objects' into maintJunio C Hamano2014-07-102-7/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mc/doc-submodule-sync-recurse' into maintJunio C Hamano2014-07-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | Seventh batch for 2.1Junio C Hamano2014-07-101-0/+22