Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ms/non-ascii-ticks' into maint | Junio C Hamano | 2018-03-22 | 1 | -7/+7 |
|\ | |||||
| * | Documentation/gitsubmodules.txt: avoid non-ASCII apostrophesms/non-ascii-ticks | Motoki Seki | 2018-02-22 | 1 | -7/+7 |
* | | Merge branch 'jk/cached-commit-buffer' into maint | Junio C Hamano | 2018-03-22 | 5 | -46/+1 |
|\ \ | |||||
| * | | revision: drop --show-all optionjk/cached-commit-buffer | Jeff King | 2018-02-22 | 3 | -42/+0 |
| * | | commit: drop uses of get_cached_commit_buffer() | Jeff King | 2018-02-22 | 2 | -4/+1 |
| |/ | |||||
* | | Merge branch 'sm/mv-dry-run-update' into maint | Junio C Hamano | 2018-03-22 | 2 | -2/+7 |
|\ \ | |||||
| * | | mv: remove unneeded 'if (!show_only)'sm/mv-dry-run-update | Stefan Moch | 2018-02-07 | 1 | -2/+1 |
| * | | t7001: add test case for --dry-run | Stefan Moch | 2018-02-07 | 1 | -0/+6 |
* | | | Merge branch 'tg/worktree-create-tracking' into maint | Junio C Hamano | 2018-03-22 | 1 | -2/+3 |
|\ \ \ | |||||
| * | | | git-worktree.txt: fix indentation of example and text of 'add' commandtg/worktree-create-tracking | Eric Sunshine | 2018-02-16 | 1 | -0/+1 |
| * | | | git-worktree.txt: fix missing ")" typo | Eric Sunshine | 2018-02-16 | 1 | -2/+2 |
* | | | | Merge branch 'gs/test-unset-xdg-cache-home' into maint | Junio C Hamano | 2018-03-22 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | test-lib.sh: unset XDG_CACHE_HOMEgs/test-unset-xdg-cache-home | Genki Sky | 2018-02-16 | 1 | -0/+1 |
* | | | | | Merge branch 'sb/status-doc-fix' into maint | Junio C Hamano | 2018-03-22 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Documentation/git-status: clarify status table for porcelain modesb/status-doc-fix | Stefan Beller | 2018-02-15 | 1 | -2/+2 |
* | | | | | | Merge branch 'rd/typofix' into maint | Junio C Hamano | 2018-03-22 | 5 | -6/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Correct mispellings of ".gitmodule" to ".gitmodules"rd/typofix | Robert P. J. Day | 2018-02-14 | 4 | -5/+5 |
| * | | | | | | t/: correct obvious typo "detahced" | Robert P. J. Day | 2018-02-14 | 1 | -1/+1 |
* | | | | | | | Merge branch 'bp/fsmonitor' into maint | Junio C Hamano | 2018-03-22 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fsmonitor: update documentation to remove reference to invalid config settingsbp/fsmonitor | Ben Peart | 2018-02-14 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'bc/doc-interpret-trailers-grammofix' into maint | Junio C Hamano | 2018-03-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | docs/interpret-trailers: fix agreement errorbc/doc-interpret-trailers-grammofix | brian m. carlson | 2018-02-13 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'sg/doc-test-must-fail-args' into maint | Junio C Hamano | 2018-03-22 | 2 | -2/+22 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t: document 'test_must_fail ok=<signal-name>'sg/doc-test-must-fail-args | SZEDER Gábor | 2018-02-12 | 2 | -2/+22 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'rj/sparse-updates' into maint | Junio C Hamano | 2018-03-22 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Makefile: suppress a sparse warning for pack-revindex.crj/sparse-updates | Ramsay Jones | 2018-02-12 | 1 | -0/+2 |
| * | | | | | | | | | config.mak.uname: remove SPARSE_FLAGS setting for cygwin | Ramsay Jones | 2018-02-12 | 1 | -1/+0 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jk/gettext-poison' into maint | Junio C Hamano | 2018-03-22 | 2 | -8/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-sh-i18n: check GETTEXT_POISON before USE_GETTEXT_SCHEMEjk/gettext-poison | Jeff King | 2018-02-08 | 1 | -4/+4 |
| * | | | | | | | | | t0205: drop redundant test | Jeff King | 2018-02-08 | 1 | -4/+0 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'nd/ignore-glob-doc-update' into maint | Junio C Hamano | 2018-03-22 | 1 | -6/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | gitignore.txt: elaborate shell glob syntaxnd/ignore-glob-doc-update | Duy Nguyen | 2018-02-02 | 1 | -6/+5 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'rs/cocci-strbuf-addf-to-addstr' into maint | Junio C Hamano | 2018-03-22 | 1 | -16/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | cocci: simplify check for trivial format stringsrs/cocci-strbuf-addf-to-addstr | René Scharfe | 2018-02-02 | 1 | -16/+1 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jc/worktree-add-short-help' into maint | Junio C Hamano | 2018-03-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | worktree: say that "add" takes an arbitrary commit in short-helpjc/worktree-add-short-help | Junio C Hamano | 2018-01-17 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'tz/doc-show-defaults-to-head' into maint | Junio C Hamano | 2018-03-22 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | doc: mention 'git show' defaults to HEADtz/doc-show-defaults-to-head | Todd Zullinger | 2018-01-30 | 1 | -2/+2 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'nd/shared-index-fix' into maint | Junio C Hamano | 2018-03-22 | 2 | -18/+41 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | read-cache: don't write index twice if we can't write shared indexnd/shared-index-fix | Nguyễn Thái Ngọc Duy | 2018-01-24 | 2 | -2/+22 |
| * | | | | | | | | | | read-cache.c: move tempfile creation/cleanup out of write_shared_index | Nguyễn Thái Ngọc Duy | 2018-01-16 | 1 | -16/+17 |
| * | | | | | | | | | | read-cache.c: change type of "temp" in write_shared_index() | Nguyễn Thái Ngọc Duy | 2018-01-16 | 1 | -9/+11 |
* | | | | | | | | | | | Merge branch 'jc/mailinfo-cleanup-fix' into maint | Junio C Hamano | 2018-03-22 | 1 | -4/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | mailinfo: avoid segfault when can't open filesjc/mailinfo-cleanup-fix | Juan F. Codagnone | 2018-01-24 | 1 | -4/+6 |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'rb/hashmap-h-compilation-fix' into maint | Junio C Hamano | 2018-03-22 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | hashmap.h: remove unused variablerb/hashmap-h-compilation-fix | Randall S. Becker | 2018-01-16 | 1 | -2/+1 |
* | | | | | | | | | | | | Merge branch 'rs/describe-unique-abbrev' into maint | Junio C Hamano | 2018-03-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | describe: use strbuf_add_unique_abbrev() for adding short hashesrs/describe-unique-abbrev | René Scharfe | 2018-01-16 | 1 | -1/+1 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'ks/submodule-doc-updates' into maint | Junio C Hamano | 2018-03-22 | 2 | -29/+87 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Doc/git-submodule: improve readability and grammar of a sentenceks/submodule-doc-updates | Kaartic Sivaraam | 2018-01-16 | 1 | -8/+8 |