summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bw/repo-object'Junio C Hamano2017-07-0520-373/+972
|\
| * ls-files: use repository objectbw/repo-objectBrandon Williams2017-06-233-115/+118
| * repository: enable initialization of submodulesBrandon Williams2017-06-232-0/+64
| * submodule: convert is_submodule_initialized to work on a repositoryBrandon Williams2017-06-234-18/+16
| * submodule: add repo_read_gitmodulesBrandon Williams2017-06-232-0/+17
| * submodule-config: store the_submodule_cache in the_repositoryBrandon Williams2017-06-234-18/+72
| * repository: add index_state to struct repoBrandon Williams2017-06-232-0/+25
| * config: read config from a repository objectBrandon Williams2017-06-234-74/+183
| * path: add repo_worktree_path and strbuf_repo_worktree_pathBrandon Williams2017-06-232-0/+49
| * path: add repo_git_path and strbuf_repo_git_pathBrandon Williams2017-06-232-0/+29
| * path: worktree_git_path() should not use file relocationBrandon Williams2017-06-231-1/+2
| * path: convert do_git_path to take a 'struct repository'Brandon Williams2017-06-231-14/+28
| * path: convert strbuf_git_common_path to take a 'struct repository'Brandon Williams2017-06-233-8/+16
| * path: always pass in commondir to update_common_dirBrandon Williams2017-06-231-3/+1
| * path: create path.hBrandon Williams2017-06-233-58/+64
| * environment: store worktree in the_repositoryBrandon Williams2017-06-231-5/+4
| * environment: place key repository state in the_repositoryBrandon Williams2017-06-234-53/+34
| * repository: introduce the repository objectBrandon Williams2017-06-233-0/+224
| * environment: remove namespace_len variableBrandon Williams2017-06-231-5/+4
| * setup: add comment indicating a hackBrandon Williams2017-06-231-0/+6
| * setup: don't perform lazy initialization of repository stateBrandon Williams2017-06-233-9/+24
| *-. Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-ob...Junio C Hamano2017-06-23155-413/+614
| |\ \
* | | | Thirteenth batch for 2.14Junio C Hamano2017-06-301-0/+23
* | | | Merge branch 'vs/typofixes'Junio C Hamano2017-06-3028-41/+41
|\ \ \ \
| * | | | Spelling fixesvs/typofixesVille Skyttä2017-06-2728-41/+41
* | | | | Merge branch 'rs/apply-validate-input'Junio C Hamano2017-06-304-7/+86
|\ \ \ \ \
| * | | | | apply: check git diffs for mutually exclusive header linesrs/apply-validate-inputRené Scharfe2017-06-272-0/+33
| * | | | | apply: check git diffs for invalid file modesRené Scharfe2017-06-272-6/+27
| * | | | | apply: check git diffs for missing old filenamesRené Scharfe2017-06-272-1/+26
* | | | | | Merge branch 'jc/pack-bitmap-unaligned'Junio C Hamano2017-06-301-1/+1
|\ \ \ \ \ \
| * | | | | | pack-bitmap: don't perform unaligned memory accessjc/pack-bitmap-unalignedJames Clarke2017-06-261-1/+1
* | | | | | | Merge branch 'ah/doc-pretty-color-auto-prefix'Junio C Hamano2017-06-301-5/+6
|\ \ \ \ \ \ \
| * | | | | | | doc: clarify syntax for %C(auto,...) in pretty formatsah/doc-pretty-color-auto-prefixAndreas Heiduk2017-06-241-5/+6
* | | | | | | | Merge branch 'ks/submodule-add-doc'Junio C Hamano2017-06-301-28/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation/git-submodule: cleanup "add" sectionks/submodule-add-docKaartic Sivaraam2017-06-221-28/+21
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'ks/status-initial-commit'Junio C Hamano2017-06-305-3/+38
|\ \ \ \ \ \ \ \
| * | | | | | | | status: contextually notify user about an initial commitks/status-initial-commitKaartic Sivaraam2017-06-215-3/+38
* | | | | | | | | Merge branch 'ab/die-errors-in-threaded'Junio C Hamano2017-06-301-1/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | die(): stop hiding errors due to overzealous recursion guardab/hide-die-errors-in-threadedab/die-errors-in-threadedÆvar Arnfjörð Bjarmason2017-06-211-1/+17
| |/ / / / / / / /
* | | | | | | | | Merge branch 'pw/rebase-i-regression-fix-tests'Junio C Hamano2017-06-304-12/+148
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | t3420: fix under GETTEXT_POISON buildpw/rebase-i-regression-fix-testsJunio C Hamano2017-06-231-2/+2
| * | | | | | | | rebase: add more regression tests for console outputPhillip Wood2017-06-191-2/+69
| * | | | | | | | rebase: add regression tests for console outputPhillip Wood2017-06-191-3/+64
| * | | | | | | | rebase -i: add test for reflog messagePhillip Wood2017-06-191-0/+7
| * | | | | | | | sequencer: print autostash messages to stderrJohannes Schindelin2017-06-192-7/+8
* | | | | | | | | Twelfth batch for 2.14Junio C Hamano2017-06-261-1/+11
* | | | | | | | | Merge branch 'mb/reword-autocomplete-message'Junio C Hamano2017-06-261-6/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | auto-correct: tweak phrasingmb/reword-autocomplete-messageMarc Branchaud2017-06-211-6/+12
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ks/t7508-indent-fix'Junio C Hamano2017-06-261-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t7508: fix a broken indentationks/t7508-indent-fixKaartic Sivaraam2017-06-211-1/+1
| |/ / / / / / / /