summaryrefslogtreecommitdiff
path: root/cache.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sk/windows-unc-path'Junio C Hamano2014-06-161-1/+0
|\
| * Windows: allow using UNC path for git repositorysk/windows-unc-pathCezary Zawadka2014-06-101-1/+0
* | Merge branch 'nd/status-auto-comment-char'Junio C Hamano2014-06-061-0/+1
|\ \
| * | commit: allow core.commentChar=auto for character auto selectionnd/status-auto-comment-charNguyễn Thái Ngọc Duy2014-05-191-0/+1
* | | Merge branch 'jk/squelch-compiler-warning-from-funny-error-macro'Junio C Hamano2014-06-061-2/+2
|\ \ \
| * | | let clang use the constant-return error() macrojk/squelch-compiler-warning-from-funny-error-macroJeff King2014-05-061-1/+1
| * | | inline constant return from error() functionJeff King2014-05-061-1/+1
| | |/ | |/|
| * | Merge branch 'jk/commit-dates-parsing-fix' into maintJunio C Hamano2014-03-181-0/+1
| |\ \
| * \ \ Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maintJunio C Hamano2014-03-181-1/+5
| |\ \ \
* | \ \ \ Merge branch 'jk/commit-date-approxidate'Junio C Hamano2014-06-031-0/+7
|\ \ \ \ \
| * | | | | pretty: make show_ident_date publicJeff King2014-05-021-0/+7
| | |_|_|/ | |/| | |
* | | | | Merge branch 'ym/fix-opportunistic-index-update-race'Junio C Hamano2014-06-031-0/+3
|\ \ \ \ \
| * | | | | read-cache.c: verify index file before we opportunistically update itym/fix-opportunistic-index-update-raceYiannis Marangos2014-04-101-0/+3
* | | | | | Merge branch 'ks/tree-diff-nway'Junio C Hamano2014-06-031-0/+15
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | tree-diff: rework diff_tree() to generate diffs for multiparent cases as wellKirill Smelkov2014-04-071-0/+15
* | | | | | Merge branch 'nd/tag-version-sort'Junio C Hamano2014-03-211-0/+2
|\ \ \ \ \ \
| * | | | | | tag: support --sort=<spec>nd/tag-version-sortNguyễn Thái Ngọc Duy2014-02-271-0/+2
| |/ / / / /
* | | | | | Merge branch 'mh/replace-refs-variable-rename'Junio C Hamano2014-03-141-2/+25
|\ \ \ \ \ \
| * | | | | | Add docstrings for lookup_replace_object() and do_lookup_replace_object()Michael Haggerty2014-02-281-0/+13
| * | | | | | rename read_replace_refs to check_replace_refsMichael Haggerty2014-02-201-2/+12
| |/ / / / /
* | | | | | Merge branch 'mh/object-code-cleanup'Junio C Hamano2014-03-141-4/+64
|\ \ \ \ \ \
| * | | | | | sha1_file.c: document a bunch of functions defined in the filemh/object-code-cleanupMichael Haggerty2014-02-241-3/+63
| * | | | | | sha1_file_name(): declare to return a const stringMichael Haggerty2014-02-241-1/+1
| |/ / / / /
* | | | | | Merge branch 'jk/commit-dates-parsing-fix'Junio C Hamano2014-03-141-0/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | date: check date overflow against time_tJeff King2014-02-241-0/+1
| * | | | | Merge branch 'jk/alias-in-bare' into maintJunio C Hamano2013-04-031-6/+19
| |\ \ \ \ \
| * \ \ \ \ \ Sync with 1.8.1 maintenance trackJunio C Hamano2013-04-031-14/+3
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'ks/config-file-stdin'Junio C Hamano2014-03-141-2/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | config: teach "git config --file -" to read from the standard inputks/config-file-stdinKirill A. Shutemov2014-02-181-0/+1
| * | | | | | | | config: change git_config_with_options() interfaceKirill A. Shutemov2014-02-181-2/+6
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'jn/add-2.0-u-A-sans-pathspec'Junio C Hamano2014-03-071-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | git add: -u/-A now affects the entire working treejn/add-2.0-u-A-sans-pathspecJunio C Hamano2013-04-261-1/+0
* | | | | | | | | Merge branch 'nd/daemonize-gc'Junio C Hamano2014-03-051-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | daemon: move daemonize() to libgit.aNguyễn Thái Ngọc Duy2014-02-101-0/+1
* | | | | | | | | | Merge branch 'jk/pack-bitmap'Junio C Hamano2014-02-271-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | sha1_file: export `git_open_noatime`Vicent Marti2013-10-241-0/+1
* | | | | | | | | | | Merge branch 'nd/reset-intent-to-add'Junio C Hamano2014-02-271-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | reset: support "--mixed --intent-to-add" modend/reset-intent-to-addNguyễn Thái Ngọc Duy2014-02-051-0/+1
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'nd/submodule-pathspec-ending-with-slash'Junio C Hamano2014-02-271-2/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | pathspec: convert some match_pathspec_depth() to ce_path_match()Nguyễn Thái Ngọc Duy2014-02-241-2/+0
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'bk/refresh-missing-ok-in-merge-recursive'Junio C Hamano2014-02-271-1/+5
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | read-cache.c: extend make_cache_entry refresh flag with optionsBrad King2014-02-241-1/+3
| * | | | | | | | | read-cache.c: refactor --ignore-missing implementationBrad King2014-02-241-0/+2
| * | | | | | | | | Merge branch 'jc/upload-pack-send-symref' into maintJunio C Hamano2013-11-081-1/+0
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | connect.c: make parse_feature_value() staticJunio C Hamano2013-09-171-1/+0
| * | | | | | | | | | Merge branch 'jk/format-patch-from' into maintJunio C Hamano2013-10-281-0/+9
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'kb/fast-hashmap'Junio C Hamano2014-02-271-11/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | name-hash: retire unused index_name_exists()Eric Sunshine2014-02-241-2/+0
| * | | | | | | | | | remove old hash.[ch] implementationKarsten Blees2013-11-181-1/+0
| * | | | | | | | | | name-hash.c: remove cache entries instead of marking them CE_UNHASHEDKarsten Blees2013-11-181-4/+2
View Lorry Controller Status