Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | | | | | Merge branch 'jk/alt-odb-cleanup' | Junio C Hamano | 2016-10-17 | 1 | -0/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | count-objects: report alternates via verbose mode | Jeff King | 2016-10-10 | 1 | -0/+5 |
* | | | | | | | | Merge branch 'nd/commit-p-doc' | Junio C Hamano | 2016-10-17 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-commit.txt: clarify --patch mode with pathspecnd/commit-p-doc | Duy Nguyen | 2016-10-05 | 1 | -2/+4 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Sync with maint | Junio C Hamano | 2016-10-11 | 1 | -0/+45 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Start preparing for 2.10.2 | Junio C Hamano | 2016-10-11 | 1 | -0/+45 |
| * | | | | | | | | Merge branch 'pb/rev-list-reverse-with-count' into maint | Junio C Hamano | 2016-10-11 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | Ninth batch for 2.11 | Junio C Hamano | 2016-10-10 | 1 | -23/+40 |
* | | | | | | | | | | Merge branch 'jc/blame-reverse' | Junio C Hamano | 2016-10-10 | 2 | -3/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | blame: dwim "blame --reverse OLD" as "blame --reverse OLD.."jc/blame-reverse | Junio C Hamano | 2016-06-14 | 1 | -2/+3 |
| * | | | | | | | | | | blame: improve diagnosis for "--reverse NEW" | Junio C Hamano | 2016-06-14 | 1 | -1/+1 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'nd/shallow-deepen' | Junio C Hamano | 2016-10-10 | 6 | -1/+75 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | fetch, upload-pack: --deepen=N extends shallow boundary by N commitsnd/shallow-deepen | Nguyễn Thái Ngọc Duy | 2016-06-13 | 4 | -0/+21 |
| * | | | | | | | | | clone: define shallow clone boundary with --shallow-exclude | Nguyễn Thái Ngọc Duy | 2016-06-13 | 1 | -0/+5 |
| * | | | | | | | | | fetch: define shallow boundary with --shallow-exclude | Nguyễn Thái Ngọc Duy | 2016-06-13 | 3 | -0/+14 |
| * | | | | | | | | | upload-pack: support define shallow boundary by excluding revisions | Nguyễn Thái Ngọc Duy | 2016-06-13 | 2 | -1/+11 |
| * | | | | | | | | | clone: define shallow clone boundary based on time with --shallow-since | Nguyễn Thái Ngọc Duy | 2016-06-13 | 1 | -0/+3 |
| * | | | | | | | | | fetch: define shallow boundary with --shallow-since | Nguyễn Thái Ngọc Duy | 2016-06-13 | 3 | -0/+11 |
| * | | | | | | | | | upload-pack: add deepen-since to cut shallow repos based on time | Nguyễn Thái Ngọc Duy | 2016-06-13 | 2 | -1/+11 |
* | | | | | | | | | | Eighth batch for 2.11 | Junio C Hamano | 2016-10-06 | 1 | -0/+34 |
* | | | | | | | | | | Merge branch 'ps/http-gssapi-cred-delegation' | Junio C Hamano | 2016-10-06 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | http: control GSSAPI credential delegationps/http-gssapi-cred-delegation | Petr Stodulka | 2016-09-29 | 1 | -0/+14 |
* | | | | | | | | | | | Merge branch 'vn/revision-shorthand-for-side-branch-log' | Junio C Hamano | 2016-10-06 | 1 | -2/+15 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | revision: new rev^-n shorthand for rev^n..rev | Vegard Nossum | 2016-09-27 | 1 | -2/+15 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'jk/ambiguous-short-object-names' | Junio C Hamano | 2016-10-06 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | sha1_array: let callbacks interrupt iteration | Jeff King | 2016-09-26 | 1 | -2/+6 |