summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* init: kill git_link variablend/init-core-worktree-in-multi-worktree-worldNguyễn Thái Ngọc Duy2016-09-251-12/+4
* init: do not set unnecessary core.worktreeNguyễn Thái Ngọc Duy2016-09-252-3/+8
* init: kill set_git_dir_init()Nguyễn Thái Ngọc Duy2016-09-251-29/+21
* init: call set_git_dir_init() from within init_db()Nguyễn Thái Ngọc Duy2016-09-253-17/+21
* init: correct re-initialization from a linked worktreeNguyễn Thái Ngọc Duy2016-09-252-1/+16
* t1007: factor out repeated setupjk/setup-sequence-updateJeff King2016-09-131-24/+8
* init: reset cached config when entering new repoJeff King2016-09-134-0/+50
* init: expand comments explaining config trickeryJeff King2016-09-131-4/+7
* config: only read .git/config from configured reposJeff King2016-09-136-4/+33
* test-config: setup git directoryJeff King2016-09-131-0/+3
* t1302: use "git -C"Jeff King2016-09-131-24/+6
* pager: handle early configJeff King2016-09-131-2/+33
* pager: use callbacks instead of configsetJeff King2016-09-131-14/+33
* pager: make pager_program a file-local staticJeff King2016-09-133-2/+1
* pager: stop loading git_default_config()Jeff King2016-09-132-4/+8
* pager: remove obsolete commentJeff King2016-09-131-5/+0
* diff: always try to set up the repositoryJeff King2016-09-132-2/+22
* diff: handle --no-index prefixes consistentlyJeff King2016-09-132-0/+21
* diff: skip implicit no-index check when given --no-indexJeff King2016-09-131-12/+13
* patch-id: use RUN_SETUP_GENTLYJeff King2016-09-132-1/+15
* hash-object: always try to set up the git repositoryJeff King2016-09-132-5/+19
* Git 2.8.4v2.8.4Junio C Hamano2016-06-064-3/+18
* Merge branch 'kb/msys2-tty' into maintJunio C Hamano2016-06-062-5/+56
|\
| * mingw: make isatty() recognize MSYS2's pseudo terminals (/dev/pty*)kb/msys2-ttyKarsten Blees2016-05-262-5/+56
* | Merge branch 'da/difftool' into maintJunio C Hamano2016-06-062-2/+30
|\ \
| * | difftool: handle unmerged files in dir-diff modeda/difftoolDavid Aguilar2016-05-162-0/+28
| * | difftool: initialize variables for readabilityDavid Aguilar2016-05-161-2/+2
* | | Merge branch 'tb/core-eol-fix' into maintJunio C Hamano2016-06-064-189/+141
|\ \ \
| * | | convert.c: ident + core.autocrlf didn't worktb/core-eol-fixTorsten Bögershausen2016-04-252-13/+8
| * | | t0027: test cases for combined attributesTorsten Bögershausen2016-04-251-169/+129
| * | | convert: allow core.autocrlf=input and core.eol=crlfTorsten Bögershausen2016-04-252-7/+3
| * | | t0027: make commit_chk_wrnNNO() reliableTorsten Bögershausen2016-04-251-1/+2
* | | | Merge branch 'ar/diff-args-osx-precompose' into maintJunio C Hamano2016-06-065-0/+47
|\ \ \ \
| * | | | diff: run arguments through precompose_argvar/diff-args-osx-precomposeAlexander Rinass2016-05-135-0/+47
* | | | | More topics for 2.8.4Junio C Hamano2016-05-311-0/+28
* | | | | Merge branch 'sb/submodule-deinit-all' into maintJunio C Hamano2016-05-313-10/+48
|\ \ \ \ \
| * | | | | submodule deinit: require '--all' instead of '.' for all submodulesStefan Beller2016-05-053-10/+48
| | |/ / / | |/| | |
* | | | | Merge branch 'bn/http-cookiefile-config' into maintJunio C Hamano2016-05-312-3/+4
|\ \ \ \ \
| * | | | | http: expand http.cookieFile as a pathbn/http-cookiefile-configBrian Norris2016-05-042-2/+3
| * | | | | Documentation: config: improve word ordering for http.cookieFileBrian Norris2016-05-041-1/+1
* | | | | | Merge branch 'jk/test-send-sh-x-trace-elsewhere' into maintJunio C Hamano2016-05-312-3/+16
|\ \ \ \ \ \
| * | | | | | test-lib: set BASH_XTRACEFD automaticallyjk/test-send-sh-x-trace-elsewhereJeff King2016-05-112-3/+16
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'js/name-rev-use-oldest-ref' into maintJunio C Hamano2016-05-312-7/+14
|\ \ \ \ \ \
| * | | | | | name-rev: include taggerdate in considering the best namejs/name-rev-use-oldest-refJohannes Schindelin2016-04-222-7/+14
| |/ / / / /
* | | | | | Start preparing for 2.8.4Junio C Hamano2016-05-261-0/+27
* | | | | | Merge branch 'jc/linkgit-fix' into maintJunio C Hamano2016-05-268-10/+10
|\ \ \ \ \ \
| * | | | | | Documentation: fix linkgit referencesjc/linkgit-fixJunio C Hamano2016-05-098-10/+10
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'ls/travis-build-doc' into maintJunio C Hamano2016-05-262-0/+29
|\ \ \ \ \ \
| * | | | | | travis-ci: build documentationls/travis-build-docLars Schneider2016-05-102-0/+29
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jc/fsck-nul-in-commit' into maintJunio C Hamano2016-05-262-3/+31
|\ \ \ \ \ \