summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ms/non-ascii-ticks' into maintJunio C Hamano2018-03-221-7/+7
|\
| * Documentation/gitsubmodules.txt: avoid non-ASCII apostrophesms/non-ascii-ticksMotoki Seki2018-02-221-7/+7
* | Merge branch 'jk/cached-commit-buffer' into maintJunio C Hamano2018-03-225-46/+1
|\ \
| * | revision: drop --show-all optionjk/cached-commit-bufferJeff King2018-02-223-42/+0
| * | commit: drop uses of get_cached_commit_buffer()Jeff King2018-02-222-4/+1
| |/
* | Merge branch 'sm/mv-dry-run-update' into maintJunio C Hamano2018-03-222-2/+7
|\ \
| * | mv: remove unneeded 'if (!show_only)'sm/mv-dry-run-updateStefan Moch2018-02-071-2/+1
| * | t7001: add test case for --dry-runStefan Moch2018-02-071-0/+6
* | | Merge branch 'tg/worktree-create-tracking' into maintJunio C Hamano2018-03-221-2/+3
|\ \ \
| * | | git-worktree.txt: fix indentation of example and text of 'add' commandtg/worktree-create-trackingEric Sunshine2018-02-161-0/+1
| * | | git-worktree.txt: fix missing ")" typoEric Sunshine2018-02-161-2/+2
* | | | Merge branch 'gs/test-unset-xdg-cache-home' into maintJunio C Hamano2018-03-221-0/+1
|\ \ \ \
| * | | | test-lib.sh: unset XDG_CACHE_HOMEgs/test-unset-xdg-cache-homeGenki Sky2018-02-161-0/+1
* | | | | Merge branch 'sb/status-doc-fix' into maintJunio C Hamano2018-03-221-2/+2
|\ \ \ \ \
| * | | | | Documentation/git-status: clarify status table for porcelain modesb/status-doc-fixStefan Beller2018-02-151-2/+2
* | | | | | Merge branch 'rd/typofix' into maintJunio C Hamano2018-03-225-6/+6
|\ \ \ \ \ \
| * | | | | | Correct mispellings of ".gitmodule" to ".gitmodules"rd/typofixRobert P. J. Day2018-02-144-5/+5
| * | | | | | t/: correct obvious typo "detahced"Robert P. J. Day2018-02-141-1/+1
* | | | | | | Merge branch 'bp/fsmonitor' into maintJunio C Hamano2018-03-221-2/+2
|\ \ \ \ \ \ \
| * | | | | | | fsmonitor: update documentation to remove reference to invalid config settingsbp/fsmonitorBen Peart2018-02-141-2/+2
* | | | | | | | Merge branch 'bc/doc-interpret-trailers-grammofix' into maintJunio C Hamano2018-03-221-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | docs/interpret-trailers: fix agreement errorbc/doc-interpret-trailers-grammofixbrian m. carlson2018-02-131-1/+1
* | | | | | | | | Merge branch 'sg/doc-test-must-fail-args' into maintJunio C Hamano2018-03-222-2/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t: document 'test_must_fail ok=<signal-name>'sg/doc-test-must-fail-argsSZEDER Gábor2018-02-122-2/+22
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'rj/sparse-updates' into maintJunio C Hamano2018-03-222-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Makefile: suppress a sparse warning for pack-revindex.crj/sparse-updatesRamsay Jones2018-02-121-0/+2
| * | | | | | | | | config.mak.uname: remove SPARSE_FLAGS setting for cygwinRamsay Jones2018-02-121-1/+0
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/gettext-poison' into maintJunio C Hamano2018-03-222-8/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-sh-i18n: check GETTEXT_POISON before USE_GETTEXT_SCHEMEjk/gettext-poisonJeff King2018-02-081-4/+4
| * | | | | | | | | t0205: drop redundant testJeff King2018-02-081-4/+0
| |/ / / / / / / /
* | | | | | | | | Merge branch 'nd/ignore-glob-doc-update' into maintJunio C Hamano2018-03-221-6/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gitignore.txt: elaborate shell glob syntaxnd/ignore-glob-doc-updateDuy Nguyen2018-02-021-6/+5
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs/cocci-strbuf-addf-to-addstr' into maintJunio C Hamano2018-03-221-16/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | cocci: simplify check for trivial format stringsrs/cocci-strbuf-addf-to-addstrRené Scharfe2018-02-021-16/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/worktree-add-short-help' into maintJunio C Hamano2018-03-221-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | worktree: say that "add" takes an arbitrary commit in short-helpjc/worktree-add-short-helpJunio C Hamano2018-01-171-1/+1
* | | | | | | | | | Merge branch 'tz/doc-show-defaults-to-head' into maintJunio C Hamano2018-03-221-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | doc: mention 'git show' defaults to HEADtz/doc-show-defaults-to-headTodd Zullinger2018-01-301-2/+2
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'nd/shared-index-fix' into maintJunio C Hamano2018-03-222-18/+41
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | read-cache: don't write index twice if we can't write shared indexnd/shared-index-fixNguyễn Thái Ngọc Duy2018-01-242-2/+22
| * | | | | | | | | | read-cache.c: move tempfile creation/cleanup out of write_shared_indexNguyễn Thái Ngọc Duy2018-01-161-16/+17
| * | | | | | | | | | read-cache.c: change type of "temp" in write_shared_index()Nguyễn Thái Ngọc Duy2018-01-161-9/+11
* | | | | | | | | | | Merge branch 'jc/mailinfo-cleanup-fix' into maintJunio C Hamano2018-03-221-4/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | mailinfo: avoid segfault when can't open filesjc/mailinfo-cleanup-fixJuan F. Codagnone2018-01-241-4/+6
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'rb/hashmap-h-compilation-fix' into maintJunio C Hamano2018-03-221-2/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | hashmap.h: remove unused variablerb/hashmap-h-compilation-fixRandall S. Becker2018-01-161-2/+1
* | | | | | | | | | | | Merge branch 'rs/describe-unique-abbrev' into maintJunio C Hamano2018-03-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | describe: use strbuf_add_unique_abbrev() for adding short hashesrs/describe-unique-abbrevRené Scharfe2018-01-161-1/+1
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ks/submodule-doc-updates' into maintJunio C Hamano2018-03-222-29/+87
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Doc/git-submodule: improve readability and grammar of a sentenceks/submodule-doc-updatesKaartic Sivaraam2018-01-161-8/+8