summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* pathspec: only match across submodule boundaries when requestedbw/pathspec-match-submodule-boundaryBrandon Williams2017-12-054-2/+24
* grep: take the read-lock when adding a submodulebw/grep-recurse-submodulesMartin Ågren2017-11-021-0/+2
* grep: recurse in-process using 'struct repository'Brandon Williams2017-08-027-344/+88
* submodule: merge repo_read_gitmodules and gitmodules_configBrandon Williams2017-08-021-20/+17
* submodule: check for unmerged .gitmodules outside of config parsingBrandon Williams2017-08-022-24/+24
* submodule: check for unstaged .gitmodules outside of config parsingBrandon Williams2017-08-024-18/+20
* submodule: remove fetch.recursesubmodules from submodule-config parsingBrandon Williams2017-08-023-15/+14
* submodule: remove submodule.fetchjobs from submodule-config parsingBrandon Williams2017-08-026-21/+40
* config: add config_from_gitmodulesBrandon Williams2017-08-022-0/+27
* cache.h: add GITMODULES_FILE macroBrandon Williams2017-08-023-11/+12
* repository: have the_repository use the_indexBrandon Williams2017-07-181-1/+3
* repo_read_index: don't discard the indexBrandon Williams2017-07-182-2/+8
* Git 2.14-rc0v2.14.0-rc0smapJunio C Hamano2017-07-132-5/+13
* Merge branch 'jk/build-with-asan'Junio C Hamano2017-07-132-3/+16
|\
| * Makefile: disable unaligned loads with UBSanJeff King2017-07-101-0/+3
| * Makefile: turn off -fomit-frame-pointer with sanitizersJeff King2017-07-101-0/+1
| * Makefile: add helper for compiling with -fsanitizeJeff King2017-07-101-0/+4
| * test-lib: turn on ASan abort_on_error by defaultJeff King2017-07-101-1/+1
| * test-lib: set ASAN_OPTIONS variable before we run gitJeff King2017-07-101-3/+8
* | Merge branch 'sb/pull-rebase-submodule'Junio C Hamano2017-07-138-41/+193
|\ \
| * | builtin/fetch cleanup: always set default value for submodule recursingStefan Beller2017-06-271-3/+2
| * | pull: optionally rebase submodules (remote submodule changes only)Stefan Beller2017-06-235-16/+157
| * | builtin/fetch: parse recurse-submodules-default at default options parsingStefan Beller2017-06-231-9/+10
| * | builtin/fetch: factor submodule recurse parsing out to submodule configStefan Beller2017-06-233-16/+27
* | | Merge branch 'sb/hashmap-customize-comparison'Junio C Hamano2017-07-1320-409/+431
|\ \ \
| * | | hashmap: migrate documentation from Documentation/technical into headersb/hashmap-customize-comparisonStefan Beller2017-06-302-341/+316
| * | | patch-ids.c: use hashmap correctlyStefan Beller2017-06-301-4/+4
| * | | hashmap.h: compare function has access to a data fieldStefan Beller2017-06-3019-66/+113
* | | | Merge branch 'ab/grep-lose-opt-regflags'Junio C Hamano2017-07-134-32/+35
|\ \ \ \
| * | | | grep: remove redundant REG_NEWLINE when compiling fixed regexab/grep-lose-opt-regflagsÆvar Arnfjörð Bjarmason2017-06-301-1/+1
| * | | | grep: remove regflags from the public grep_opt APIÆvar Arnfjörð Bjarmason2017-06-304-14/+34
| * | | | grep: remove redundant and verbose re-assignments to 0Ævar Arnfjörð Bjarmason2017-06-301-11/+0
| * | | | grep: remove redundant "fixed" field re-assignment to 0Ævar Arnfjörð Bjarmason2017-06-301-2/+0
| * | | | grep: adjust a redundant grep pattern type assignmentÆvar Arnfjörð Bjarmason2017-06-301-4/+1
| * | | | grep: remove redundant double assignment to 0Ævar Arnfjörð Bjarmason2017-06-301-1/+0
| |/ / /
* | | | Sync with v2.13.3Junio C Hamano2017-07-121-0/+9
|\ \ \ \
| * | | | Git 2.13.3v2.13.3Junio C Hamano2017-07-122-1/+10
| * | | | Merge branch 'kn/ref-filter-branch-list' into maintJunio C Hamano2017-07-123-7/+54
| |\ \ \ \
| * \ \ \ \ Merge branch 'ks/typofix-commit-c-comment' into maintJunio C Hamano2017-07-121-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/reflog-walk-maint' into maintJunio C Hamano2017-07-123-12/+42
| |\ \ \ \ \ \
* | | | | | | | Hopefully the last batch before -rc0Junio C Hamano2017-07-121-0/+9
* | | | | | | | Merge branch 'ks/fix-rebase-doc-picture'Junio C Hamano2017-07-121-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | doc: correct a mistake in an illustrationks/fix-rebase-doc-pictureKaartic Sivaraam2017-07-101-1/+1
* | | | | | | | | Merge branch 'rs/wt-status-cleanup'Junio C Hamano2017-07-121-3/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | wt-status: use separate variable for result of shorten_unambiguous_refrs/wt-status-cleanupRené Scharfe2017-07-101-3/+4
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'rs/use-div-round-up'Junio C Hamano2017-07-129-15/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | use DIV_ROUND_UPrs/use-div-round-upRené Scharfe2017-07-109-15/+14
| |/ / / / / / / /
* | | | | | | | | Merge branch 'kn/ref-filter-branch-list'Junio C Hamano2017-07-123-7/+54
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | ref-filter.c: drop return from void functionkn/ref-filter-branch-listAlejandro R. Sedeño2017-07-101-1/+1
| * | | | | | | | branch: set remote color in ref-filter branch immediatelyJeff King2017-07-091-5/+6
View Lorry Controller Status