Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | A bit of updates post -rc0 | Junio C Hamano | 2016-11-01 | 1 | -7/+8 |
* | Git 2.11-rc0v2.11.0-rc0 | Junio C Hamano | 2016-10-31 | 1 | -27/+41 |
* | Merge branch 'sc/fmt-merge-msg-doc-markup-fix' | Junio C Hamano | 2016-10-31 | 1 | -2/+2 |
|\ | |||||
| * | Documentation/fmt-merge-msg: fix markup in examplesc/fmt-merge-msg-doc-markup-fix | Stefan Christ | 2016-10-28 | 1 | -2/+2 |
* | | Merge branch 'jk/rebase-config-insn-fmt-docfix' | Junio C Hamano | 2016-10-31 | 1 | -1/+1 |
|\ \ | |||||
| * | | doc: fix missing "::" in config listjk/rebase-config-insn-fmt-docfix | Jeff King | 2016-10-30 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'aw/numbered-stash' | Junio C Hamano | 2016-10-31 | 1 | -1/+2 |
|\ \ | |||||
| * | | stash: allow stashes to be referenced by index onlyaw/numbered-stash | Aaron M Watson | 2016-10-26 | 1 | -1/+2 |
* | | | Merge branch 'jt/trailer-with-cruft' | Junio C Hamano | 2016-10-31 | 1 | -6/+8 |
|\ \ \ | |||||
| * | | | trailer: support values folded to multiple lines | Jonathan Tan | 2016-10-21 | 1 | -3/+4 |
| * | | | trailer: forbid leading whitespace in trailers | Jonathan Tan | 2016-10-21 | 1 | -1/+1 |
| * | | | trailer: allow non-trailers in trailer block | Jonathan Tan | 2016-10-21 | 1 | -2/+3 |
* | | | | Merge branch 'ls/filter-process' | Junio C Hamano | 2016-10-31 | 1 | -1/+156 |
|\ \ \ \ | |||||
| * | | | | contrib/long-running-filter: add long running filter example | Lars Schneider | 2016-10-17 | 1 | -1/+3 |
| * | | | | convert: add filter.<driver>.process option | Lars Schneider | 2016-10-17 | 1 | -1/+154 |
* | | | | | Sync with 2.10.2 | Junio C Hamano | 2016-10-28 | 2 | -1/+68 |
|\ \ \ \ \ | |||||
| * | | | | | Git 2.10.2v2.10.2 | Junio C Hamano | 2016-10-28 | 2 | -1/+68 |
| * | | | | | Merge branch 'rs/pretty-format-color-doc-fix' into maint | Junio C Hamano | 2016-10-28 | 1 | -1/+2 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'po/fix-doc-merge-base-illustration' into maint | Junio C Hamano | 2016-10-28 | 2 | -21/+21 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'bw/submodule-branch-dot-doc' into maint | Junio C Hamano | 2016-10-28 | 2 | -3/+8 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'sb/submodule-config-doc-drop-path' into maint | Junio C Hamano | 2016-10-28 | 1 | -5/+6 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'nd/commit-p-doc' into maint | Junio C Hamano | 2016-10-28 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'yk/git-tag-remove-mention-of-old-layout-in-doc' into maint | Junio C Hamano | 2016-10-28 | 1 | -3/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | Getting ready for 2.11-rc0 | Junio C Hamano | 2016-10-27 | 1 | -1/+36 |
* | | | | | | | | | | | | Merge branch 'nd/ita-empty-commit' | Junio C Hamano | 2016-10-27 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | diff: add --ita-[in]visible-in-index | Nguyễn Thái Ngọc Duy | 2016-10-24 | 1 | -0/+8 |
* | | | | | | | | | | | | | Eleventh batch for 2.11 | Junio C Hamano | 2016-10-26 | 1 | -0/+106 |
* | | | | | | | | | | | | | Merge branch 'po/fix-doc-merge-base-illustration' | Junio C Hamano | 2016-10-26 | 2 | -21/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | doc: fix the 'revert a faulty merge' ASCII art tab spacingpo/fix-doc-merge-base-illustration | Philip Oakley | 2016-10-24 | 1 | -8/+8 |
| * | | | | | | | | | | | | doc: fix merge-base ASCII art tab spacing | Philip Oakley | 2016-10-21 | 1 | -13/+13 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'yk/git-tag-remove-mention-of-old-layout-in-doc' | Junio C Hamano | 2016-10-26 | 1 | -3/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | doc: remove reference to the traditional layout in git-tag.txtyk/git-tag-remove-mention-of-old-layout-in-doc | Younes Khoudli | 2016-10-20 | 1 | -3/+2 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'bw/submodule-branch-dot-doc' | Junio C Hamano | 2016-10-26 | 2 | -3/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | submodules doc: update documentation for "." used for submodule branchesbw/submodule-branch-dot-doc | Brandon Williams | 2016-10-19 | 2 | -3/+8 |
* | | | | | | | | | | | Merge branch 'mg/gpg-richer-status' | Junio C Hamano | 2016-10-26 | 1 | -2/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | gpg-interface: use more status lettersmg/gpg-richer-status | Michael J Gruber | 2016-10-12 | 1 | -2/+8 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'bw/ls-files-recurse-submodules' | Junio C Hamano | 2016-10-26 | 2 | -1/+12 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | ls-files: add pathspec matching for submodulesbw/ls-files-recurse-submodules | Brandon Williams | 2016-10-10 | 1 | -2/+1 |
| * | | | | | | | | | | | ls-files: optionally recurse into submodules | Brandon Williams | 2016-10-10 | 1 | -1/+7 |
| * | | | | | | | | | | | git: make super-prefix option | Brandon Williams | 2016-10-10 | 1 | -0/+6 |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jc/ws-error-highlight' | Junio C Hamano | 2016-10-26 | 2 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | diff: introduce diff.wsErrorHighlight optionjc/ws-error-highlight | Junio C Hamano | 2016-10-04 | 2 | -0/+8 |
* | | | | | | | | | | | Tenth batch for 2.11 | Junio C Hamano | 2016-10-17 | 1 | -16/+49 |
* | | | | | | | | | | | Merge branch 'sb/submodule-config-doc-drop-path' | Junio C Hamano | 2016-10-17 | 1 | -5/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | documentation: improve submodule.<name>.{url, path} descriptionsb/submodule-config-doc-drop-path | Stefan Beller | 2016-10-11 | 1 | -5/+6 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'rs/pretty-format-color-doc-fix' | Junio C Hamano | 2016-10-17 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | pretty: fix document link for color specificationrs/pretty-format-color-doc-fix | René Scharfe | 2016-10-11 | 1 | -1/+2 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'da/mergetool-diff-order' | Junio C Hamano | 2016-10-17 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | mergetool: honor -O<orderfile>da/mergetool-diff-order | David Aguilar | 2016-10-11 | 1 | -4/+6 |
| * | | | | | | | | | mergetool: honor diff.orderFile | David Aguilar | 2016-10-11 | 1 | -0/+5 |