summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* refs: use chdir_notify to update cached relative pathsjk/relative-directory-fixJeff King2018-03-303-0/+21
* set_work_tree: use chdir_notifyJeff King2018-03-302-7/+25
* add chdir-notify APIJeff King2018-03-303-0/+167
* trace.c: export trace_setup_keyNguyễn Thái Ngọc Duy2018-03-302-7/+8
* set_git_dir: die when setenv() failsJeff King2018-03-302-4/+3
* Merge branch 'jh/partial-clone'Junio C Hamano2018-03-293-5/+6
|\
| * upload-pack: disable object filtering when disabled by configjh/partial-cloneJonathan Nieder2018-03-292-5/+5
| * unpack-trees: release oid_array after use in check_updates()René Scharfe2018-03-251-0/+1
* | Git 2.17-rc2v2.17.0-rc2Junio C Hamano2018-03-281-1/+1
* | Merge branch 'tg/stash-doc-typofix'Junio C Hamano2018-03-281-1/+1
|\ \
| * | git-stash.txt: remove extra square brackettg/stash-doc-typofixThomas Gummerer2018-03-271-1/+1
* | | Merge branch 'pc/submodule-helper'Junio C Hamano2018-03-281-1/+1
|\ \ \
| * | | submodule deinit: handle non existing pathspecs gracefullypc/submodule-helperStefan Beller2018-03-271-1/+1
* | | | Merge branch 'nd/parseopt-completion'Junio C Hamano2018-03-282-0/+35
|\ \ \ \
| * | | | t9902: disable test on the list of merge-strategies under GETTEXT_POISONnd/parseopt-completionJunio C Hamano2018-03-231-1/+1
| * | | | completion: clear cached --options when sourcing the completion scriptSZEDER Gábor2018-03-222-0/+35
* | | | | Sync with Git 2.16.3Junio C Hamano2018-03-221-0/+49
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Git 2.16.3v2.16.3snapJunio C Hamano2018-03-223-2/+51
| * | | | Merge branch 'ms/non-ascii-ticks' into maintJunio C Hamano2018-03-221-7/+7
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/cached-commit-buffer' into maintJunio C Hamano2018-03-225-46/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'sm/mv-dry-run-update' into maintJunio C Hamano2018-03-222-2/+7
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'tg/worktree-create-tracking' into maintJunio C Hamano2018-03-221-2/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'gs/test-unset-xdg-cache-home' into maintJunio C Hamano2018-03-221-0/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'sb/status-doc-fix' into maintJunio C Hamano2018-03-221-2/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rd/typofix' into maintJunio C Hamano2018-03-225-6/+6
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'bp/fsmonitor' into maintJunio C Hamano2018-03-221-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/doc-interpret-trailers-grammofix' into maintJunio C Hamano2018-03-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/doc-test-must-fail-args' into maintJunio C Hamano2018-03-222-2/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rj/sparse-updates' into maintJunio C Hamano2018-03-222-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/gettext-poison' into maintJunio C Hamano2018-03-222-8/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/ignore-glob-doc-update' into maintJunio C Hamano2018-03-221-6/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/cocci-strbuf-addf-to-addstr' into maintJunio C Hamano2018-03-221-16/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/worktree-add-short-help' into maintJunio C Hamano2018-03-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tz/doc-show-defaults-to-head' into maintJunio C Hamano2018-03-221-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/shared-index-fix' into maintJunio C Hamano2018-03-222-18/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/mailinfo-cleanup-fix' into maintJunio C Hamano2018-03-221-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rb/hashmap-h-compilation-fix' into maintJunio C Hamano2018-03-221-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/describe-unique-abbrev' into maintJunio C Hamano2018-03-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ks/submodule-doc-updates' into maintJunio C Hamano2018-03-222-29/+87
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cl/t9001-cleanup' into maintJunio C Hamano2018-03-221-10/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bw/oidmap-autoinit' into maintJunio C Hamano2018-03-221-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/test-i18ngrep' into maintJunio C Hamano2018-03-228-43/+72
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jt/fsck-code-cleanup' into maintJunio C Hamano2018-03-221-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/svn-branch-segfault-fix' into maintJunio C Hamano2018-03-221-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/list-merge-strategy' into maintJunio C Hamano2018-03-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/daemon-fixes' into maintJunio C Hamano2018-03-224-20/+107
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tg/split-index-fixes' into maintJunio C Hamano2018-03-228-17/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mr/packed-ref-store-fix' into maintJunio C Hamano2018-03-221-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jt/http-redact-cookies' into maintJunio C Hamano2018-03-223-8/+117
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/diff-flush-before-warning' into maintJunio C Hamano2018-03-221-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \