summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mg/killed-merge' into maintJunio C Hamano2017-09-101-1/+4
|\
| * Documentation/git-merge: explain --continueMichael J Gruber2017-08-211-1/+4
* | Merge branch 'ma/pager-per-subcommand-action' into maintJunio C Hamano2017-09-102-73/+3
|\ \
| * | tag: change default of `pager.tag` to "on"Martin Ågren2017-08-031-1/+1
| * | tag: respect `pager.tag` in list-mode onlyMartin Ågren2017-08-031-0/+3
| * | builtin.h: take over documentation from api-builtin.txtMartin Ågren2017-08-031-73/+0
* | | Prepare for 2.14.2Junio C Hamano2017-08-231-0/+35
* | | Merge branch 'jt/subprocess-handshake' into maintJunio C Hamano2017-08-232-63/+65
|\ \ \
| * | | Documentation: migrate sub-process docs to headerJonathan Tan2017-07-261-59/+0
| * | | Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshakeJunio C Hamano2017-07-261-4/+65
| |\ \ \
| | * | | convert: add "status=delayed" to filter process protocolLars Schneider2017-06-301-4/+65
* | | | | Merge branch 'ah/doc-wserrorhighlight' into maintJunio C Hamano2017-08-232-13/+15
|\ \ \ \ \
| * | | | | doc: add missing values "none" and "default" for diff.wsErrorHighlightah/doc-wserrorhighlightAndreas Heiduk2017-07-252-13/+15
* | | | | | Merge branch 'jk/ref-filter-colors' into maintJunio C Hamano2017-08-232-9/+15
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | pretty: respect color settings for %C placeholdersJeff King2017-07-131-7/+11
| * | | | | docs/for-each-ref: update pointer to color syntaxJeff King2017-07-131-2/+4
* | | | | | Git 2.14.1v2.14.1Junio C Hamano2017-08-041-0/+4
* | | | | | Merge tag 'v2.13.5' into maintJunio C Hamano2017-08-047-0/+49
|\ \ \ \ \ \
| * | | | | | Git 2.13.5v2.13.5Junio C Hamano2017-08-011-0/+4
| * | | | | | Merge tag 'v2.12.4' into maintJunio C Hamano2017-08-016-0/+45
| |\ \ \ \ \ \
| | * | | | | | Git 2.12.4v2.12.4Junio C Hamano2017-07-301-0/+4
| | * | | | | | Merge tag 'v2.11.3' into maint-2.12Junio C Hamano2017-07-305-0/+41
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Git 2.11.3v2.11.3Junio C Hamano2017-07-301-0/+4
| | | * | | | | Merge tag 'v2.10.4' into maint-2.11Junio C Hamano2017-07-304-0/+37
| | | |\ \ \ \ \
| | | | * | | | | Git 2.10.4v2.10.4Junio C Hamano2017-07-301-0/+4
| | | | * | | | | Merge tag 'v2.9.5' into maint-2.10Junio C Hamano2017-07-303-0/+33
| | | | |\ \ \ \ \
| | | | | * | | | | Git 2.9.5v2.9.5maint-2.9Junio C Hamano2017-07-301-0/+4
| | | | | * | | | | Merge tag 'v2.8.6' into maint-2.9Junio C Hamano2017-07-302-0/+29
| | | | | |\ \ \ \ \
| | | | | | * | | | | Git 2.8.6v2.8.6maint-2.8Junio C Hamano2017-07-301-0/+4
| | | | | | * | | | | Merge tag 'v2.7.6' into maint-2.8Junio C Hamano2017-07-301-0/+25
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | Git 2.7.6v2.7.6maint-2.7Junio C Hamano2017-07-301-0/+25
* | | | | | | | | | | | Git 2.14v2.14.0Junio C Hamano2017-08-041-12/+2
* | | | | | | | | | | | Merge branch 'ah/patch-id-doc'Junio C Hamano2017-08-041-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | doc: remove unsupported parameter from patch-idah/patch-id-docAndreas Heiduk2017-07-281-3/+0
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'as/diff-options-grammofix'Junio C Hamano2017-08-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | diff-options doc: grammar fixas/diff-options-grammofixAnthony Sottile2017-07-311-1/+1
* | | | | | | | | | | | Sync with maintJunio C Hamano2017-07-311-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | / / | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Preparation for 2.13.4 continuesJunio C Hamano2017-07-311-0/+18
| * | | | | | | | | | Merge branch 'ks/doc-fixes' into maintJunio C Hamano2017-07-312-10/+11
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Sync with maintJunio C Hamano2017-07-211-0/+10
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | fixes from 'master' for 2.13.4Junio C Hamano2017-07-211-0/+10
| * | | | | | | | | | Merge branch 'ks/fix-rebase-doc-picture' into maintJunio C Hamano2017-07-211-1/+1
| |\ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | Hopefully the final last-minute fix before -rc1Junio C Hamano2017-07-211-1/+11
* | | | | | | | | | | | Merge branch 'ks/doc-fixes'Junio C Hamano2017-07-212-10/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | doc: reformat the paragraph containing the 'cut-line'ks/doc-fixesKaartic Sivaraam2017-07-181-5/+6
| * | | | | | | | | | | doc: camelCase the i18n config variables to improve readabilityKaartic Sivaraam2017-07-171-5/+5
| |/ / / / / / / / / /
* | | | | | | | | | | A few more topics while waiting for the po/PRItime resolutionJunio C Hamano2017-07-201-0/+12
* | | | | | | | | | | RelNotes: mention "sha1dc: optionally use sha1collisiondetection as a submodule"Ævar Arnfjörð Bjarmason2017-07-201-0/+5
* | | | | | | | | | | RelNotes: mention "log: make --regexp-ignore-case work with --perl-regexp"Ævar Arnfjörð Bjarmason2017-07-201-0/+3
* | | | | | | | | | | RelNotes: mention "log: add -P as a synonym for --perl-regexp"Ævar Arnfjörð Bjarmason2017-07-201-0/+2
View Lorry Controller Status