summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Eleventh batch for 2.11Junio C Hamano2016-10-261-0/+106
* Merge branch 'po/fix-doc-merge-base-illustration'Junio C Hamano2016-10-262-21/+21
|\
| * doc: fix the 'revert a faulty merge' ASCII art tab spacingpo/fix-doc-merge-base-illustrationPhilip Oakley2016-10-241-8/+8
| * doc: fix merge-base ASCII art tab spacingPhilip Oakley2016-10-211-13/+13
* | Merge branch 'yk/git-tag-remove-mention-of-old-layout-in-doc'Junio C Hamano2016-10-261-3/+2
|\ \
| * | doc: remove reference to the traditional layout in git-tag.txtyk/git-tag-remove-mention-of-old-layout-in-docYounes Khoudli2016-10-201-3/+2
| |/
* | Merge branch 'bw/submodule-branch-dot-doc'Junio C Hamano2016-10-262-3/+8
|\ \
| * | submodules doc: update documentation for "." used for submodule branchesbw/submodule-branch-dot-docBrandon Williams2016-10-192-3/+8
* | | Merge branch 'mg/gpg-richer-status'Junio C Hamano2016-10-261-2/+8
|\ \ \
| * | | gpg-interface: use more status lettersmg/gpg-richer-statusMichael J Gruber2016-10-121-2/+8
* | | | Merge branch 'bw/ls-files-recurse-submodules'Junio C Hamano2016-10-262-1/+12
|\ \ \ \
| * | | | ls-files: add pathspec matching for submodulesbw/ls-files-recurse-submodulesBrandon Williams2016-10-101-2/+1
| * | | | ls-files: optionally recurse into submodulesBrandon Williams2016-10-101-1/+7
| * | | | git: make super-prefix optionBrandon Williams2016-10-101-0/+6
* | | | | Merge branch 'jc/ws-error-highlight'Junio C Hamano2016-10-262-0/+8
|\ \ \ \ \
| * | | | | diff: introduce diff.wsErrorHighlight optionjc/ws-error-highlightJunio C Hamano2016-10-042-0/+8
* | | | | | Tenth batch for 2.11Junio C Hamano2016-10-171-16/+49
* | | | | | Merge branch 'sb/submodule-config-doc-drop-path'Junio C Hamano2016-10-171-5/+6
|\ \ \ \ \ \
| * | | | | | documentation: improve submodule.<name>.{url, path} descriptionsb/submodule-config-doc-drop-pathStefan Beller2016-10-111-5/+6
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'rs/pretty-format-color-doc-fix'Junio C Hamano2016-10-171-1/+2
|\ \ \ \ \ \
| * | | | | | pretty: fix document link for color specificationrs/pretty-format-color-doc-fixRené Scharfe2016-10-111-1/+2
| |/ / / / /
* | | | | | Merge branch 'da/mergetool-diff-order'Junio C Hamano2016-10-171-0/+7
|\ \ \ \ \ \
| * | | | | | mergetool: honor -O<orderfile>da/mergetool-diff-orderDavid Aguilar2016-10-111-4/+6
| * | | | | | mergetool: honor diff.orderFileDavid Aguilar2016-10-111-0/+5
* | | | | | | Merge branch 'jk/alt-odb-cleanup'Junio C Hamano2016-10-171-0/+5
|\ \ \ \ \ \ \
| * | | | | | | count-objects: report alternates via verbose modeJeff King2016-10-101-0/+5
* | | | | | | | Merge branch 'nd/commit-p-doc'Junio C Hamano2016-10-171-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | git-commit.txt: clarify --patch mode with pathspecnd/commit-p-docDuy Nguyen2016-10-051-2/+4
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Sync with maintJunio C Hamano2016-10-111-0/+45
|\ \ \ \ \ \ \ \
| * | | | | | | | Start preparing for 2.10.2Junio C Hamano2016-10-111-0/+45
| * | | | | | | | Merge branch 'pb/rev-list-reverse-with-count' into maintJunio C Hamano2016-10-111-2/+3
| |\ \ \ \ \ \ \ \
* | | | | | | | | | Ninth batch for 2.11Junio C Hamano2016-10-101-23/+40
* | | | | | | | | | Merge branch 'jc/blame-reverse'Junio C Hamano2016-10-102-3/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | blame: dwim "blame --reverse OLD" as "blame --reverse OLD.."jc/blame-reverseJunio C Hamano2016-06-141-2/+3
| * | | | | | | | | | blame: improve diagnosis for "--reverse NEW"Junio C Hamano2016-06-141-1/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'nd/shallow-deepen'Junio C Hamano2016-10-106-1/+75
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | fetch, upload-pack: --deepen=N extends shallow boundary by N commitsnd/shallow-deepenNguyễn Thái Ngọc Duy2016-06-134-0/+21
| * | | | | | | | | clone: define shallow clone boundary with --shallow-excludeNguyễn Thái Ngọc Duy2016-06-131-0/+5
| * | | | | | | | | fetch: define shallow boundary with --shallow-excludeNguyễn Thái Ngọc Duy2016-06-133-0/+14
| * | | | | | | | | upload-pack: support define shallow boundary by excluding revisionsNguyễn Thái Ngọc Duy2016-06-132-1/+11
| * | | | | | | | | clone: define shallow clone boundary based on time with --shallow-sinceNguyễn Thái Ngọc Duy2016-06-131-0/+3
| * | | | | | | | | fetch: define shallow boundary with --shallow-sinceNguyễn Thái Ngọc Duy2016-06-133-0/+11
| * | | | | | | | | upload-pack: add deepen-since to cut shallow repos based on timeNguyễn Thái Ngọc Duy2016-06-132-1/+11
* | | | | | | | | | Eighth batch for 2.11Junio C Hamano2016-10-061-0/+34
* | | | | | | | | | Merge branch 'ps/http-gssapi-cred-delegation'Junio C Hamano2016-10-061-0/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | http: control GSSAPI credential delegationps/http-gssapi-cred-delegationPetr Stodulka2016-09-291-0/+14
* | | | | | | | | | | Merge branch 'vn/revision-shorthand-for-side-branch-log'Junio C Hamano2016-10-061-2/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | revision: new rev^-n shorthand for rev^n..revVegard Nossum2016-09-271-2/+15
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jk/ambiguous-short-object-names'Junio C Hamano2016-10-061-2/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | sha1_array: let callbacks interrupt iterationJeff King2016-09-261-2/+6