Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | RelNotes: further fixes for 2.14.2 from the master front | Junio C Hamano | 2017-09-10 | 1 | -0/+59 |
* | Merge branch 'jt/doc-pack-objects-fix' into maint | Junio C Hamano | 2017-09-10 | 1 | -6/+11 |
|\ | |||||
| * | Doc: clarify that pack-objects makes packs, pluraljt/doc-pack-objects-fix | Jonathan Tan | 2017-08-23 | 1 | -6/+11 |
* | | Merge branch 'jk/doc-the-this' into maint | Junio C Hamano | 2017-09-10 | 1 | -2/+2 |
|\ \ | |||||
| * | | doc: fix typo in sendemail.identityjk/doc-the-this | Jeff King | 2017-08-20 | 1 | -2/+2 |
* | | | Merge branch 'mg/format-ref-doc-fix' into maint | Junio C Hamano | 2017-09-10 | 3 | -8/+9 |
|\ \ \ | |||||
| * | | | Documentation/git-for-each-ref: clarify peeling of tags for --formatmg/format-ref-doc-fix | Michael J Gruber | 2017-08-18 | 1 | -2/+3 |
| * | | | Documentation: use proper wording for ref format strings | Michael J Gruber | 2017-08-18 | 3 | -6/+6 |
* | | | | Merge branch 'ah/doc-empty-string-is-false' into maint | Junio C Hamano | 2017-09-10 | 2 | -6/+7 |
|\ \ \ \ | |||||
| * | | | | doc: clarify "config --bool" behaviour with empty stringah/doc-empty-string-is-false | Andreas Heiduk | 2017-08-14 | 2 | -6/+7 |
* | | | | | Merge branch 'mg/killed-merge' into maint | Junio C Hamano | 2017-09-10 | 1 | -1/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Documentation/git-merge: explain --continue | Michael J Gruber | 2017-08-21 | 1 | -1/+4 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'ma/pager-per-subcommand-action' into maint | Junio C Hamano | 2017-09-10 | 2 | -73/+3 |
|\ \ \ \ \ | |||||
| * | | | | | tag: change default of `pager.tag` to "on" | Martin Ågren | 2017-08-03 | 1 | -1/+1 |
| * | | | | | tag: respect `pager.tag` in list-mode only | Martin Ågren | 2017-08-03 | 1 | -0/+3 |
| * | | | | | builtin.h: take over documentation from api-builtin.txt | Martin Ågren | 2017-08-03 | 1 | -73/+0 |
* | | | | | | Prepare for 2.14.2 | Junio C Hamano | 2017-08-23 | 1 | -0/+35 |
* | | | | | | Merge branch 'jt/subprocess-handshake' into maint | Junio C Hamano | 2017-08-23 | 2 | -63/+65 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation: migrate sub-process docs to header | Jonathan Tan | 2017-07-26 | 1 | -59/+0 |
| * | | | | | | Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshake | Junio C Hamano | 2017-07-26 | 1 | -4/+65 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | convert: add "status=delayed" to filter process protocol | Lars Schneider | 2017-06-30 | 1 | -4/+65 |
* | | | | | | | | Merge branch 'ah/doc-wserrorhighlight' into maint | Junio C Hamano | 2017-08-23 | 2 | -13/+15 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | doc: add missing values "none" and "default" for diff.wsErrorHighlightah/doc-wserrorhighlight | Andreas Heiduk | 2017-07-25 | 2 | -13/+15 |
* | | | | | | | | | Merge branch 'jk/ref-filter-colors' into maint | Junio C Hamano | 2017-08-23 | 2 | -9/+15 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | pretty: respect color settings for %C placeholders | Jeff King | 2017-07-13 | 1 | -7/+11 |
| * | | | | | | | | docs/for-each-ref: update pointer to color syntax | Jeff King | 2017-07-13 | 1 | -2/+4 |
* | | | | | | | | | Git 2.14.1v2.14.1 | Junio C Hamano | 2017-08-04 | 1 | -0/+4 |
* | | | | | | | | | Merge tag 'v2.13.5' into maint | Junio C Hamano | 2017-08-04 | 7 | -0/+49 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Git 2.13.5v2.13.5 | Junio C Hamano | 2017-08-01 | 1 | -0/+4 |
| * | | | | | | | | | Merge tag 'v2.12.4' into maint | Junio C Hamano | 2017-08-01 | 6 | -0/+45 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||||
| | * | | | | | | | | Git 2.12.4v2.12.4 | Junio C Hamano | 2017-07-30 | 1 | -0/+4 |
| | * | | | | | | | | Merge tag 'v2.11.3' into maint-2.12 | Junio C Hamano | 2017-07-30 | 5 | -0/+41 |
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | / / | | | | |_|_|_|/ / | | | |/| | | | | | |||||
| | | * | | | | | | Git 2.11.3v2.11.3 | Junio C Hamano | 2017-07-30 | 1 | -0/+4 |
| | | * | | | | | | Merge tag 'v2.10.4' into maint-2.11 | Junio C Hamano | 2017-07-30 | 4 | -0/+37 |
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | | | |||||
| | | | * | | | | | Git 2.10.4v2.10.4 | Junio C Hamano | 2017-07-30 | 1 | -0/+4 |
| | | | * | | | | | Merge tag 'v2.9.5' into maint-2.10 | Junio C Hamano | 2017-07-30 | 3 | -0/+33 |
| | | | |\ \ \ \ \ | |||||
| | | | | * | | | | | Git 2.9.5v2.9.5maint-2.9 | Junio C Hamano | 2017-07-30 | 1 | -0/+4 |
| | | | | * | | | | | Merge tag 'v2.8.6' into maint-2.9 | Junio C Hamano | 2017-07-30 | 2 | -0/+29 |
| | | | | |\ \ \ \ \ | |||||
| | | | | | * | | | | | Git 2.8.6v2.8.6maint-2.8 | Junio C Hamano | 2017-07-30 | 1 | -0/+4 |
| | | | | | * | | | | | Merge tag 'v2.7.6' into maint-2.8 | Junio C Hamano | 2017-07-30 | 1 | -0/+25 |
| | | | | | |\ \ \ \ \ | |||||
| | | | | | | * | | | | | Git 2.7.6v2.7.6maint-2.7 | Junio C Hamano | 2017-07-30 | 1 | -0/+25 |
* | | | | | | | | | | | | Git 2.14v2.14.0 | Junio C Hamano | 2017-08-04 | 1 | -12/+2 |
* | | | | | | | | | | | | Merge branch 'ah/patch-id-doc' | Junio C Hamano | 2017-08-04 | 1 | -3/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | doc: remove unsupported parameter from patch-idah/patch-id-doc | Andreas Heiduk | 2017-07-28 | 1 | -3/+0 |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'as/diff-options-grammofix' | Junio C Hamano | 2017-08-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | diff-options doc: grammar fixas/diff-options-grammofix | Anthony Sottile | 2017-07-31 | 1 | -1/+1 |
* | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2017-07-31 | 1 | -0/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | / / | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Preparation for 2.13.4 continues | Junio C Hamano | 2017-07-31 | 1 | -0/+18 |
| * | | | | | | | | | | Merge branch 'ks/doc-fixes' into maint | Junio C Hamano | 2017-07-31 | 2 | -10/+11 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Sync with maint | Junio C Hamano | 2017-07-21 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |