Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Git 2.5.0-rc1v2.5.0-rc1 | Junio C Hamano | 2015-07-01 | 1 | -0/+7 |
* | Merge branch 'mm/describe-doc' | Junio C Hamano | 2015-07-01 | 1 | -1/+1 |
|\ | |||||
| * | Documentation/describe: improve one-line summary | Matthieu Moy | 2015-06-16 | 1 | -1/+1 |
* | | Git 2.5.0-rc0v2.5.0-rc0 | Junio C Hamano | 2015-06-25 | 1 | -15/+2 |
* | | Sync with 2.4.5 | Junio C Hamano | 2015-06-25 | 2 | -1/+30 |
|\ \ | |||||
| * | | Git 2.4.5v2.4.5 | Junio C Hamano | 2015-06-25 | 2 | -1/+30 |
| * | | Merge branch 'sg/merge-summary-config' into maint | Junio C Hamano | 2015-06-25 | 3 | -16/+12 |
| |\ \ | |||||
| * \ \ | Merge branch 'sb/pack-protocol-mention-smart-http' into maint | Junio C Hamano | 2015-06-25 | 1 | -3/+3 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jk/color-diff-plain-is-context' into maint | Junio C Hamano | 2015-06-25 | 1 | -1/+2 |
| |\ \ \ \ | |||||
* | | | | | | Ninth batch for 2.5 | Junio C Hamano | 2015-06-24 | 1 | -39/+102 |
* | | | | | | Merge branch 'fk/doc-format-patch-vn' | Junio C Hamano | 2015-06-24 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | doc: format-patch: fix typo | Frans Klaver | 2015-06-10 | 1 | -1/+1 |
* | | | | | | | Merge branch 'rl/am-3way-config' | Junio C Hamano | 2015-06-24 | 2 | -2/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-am: add am.threeWay config variable | Remi Lespinet | 2015-06-04 | 2 | -2/+13 |
* | | | | | | | | Merge branch 'jc/ll-merge-expose-path' | Junio C Hamano | 2015-06-24 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | ll-merge: pass the original path to external drivers | Junio C Hamano | 2015-06-05 | 1 | -1/+4 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'pt/pull-optparse' | Junio C Hamano | 2015-06-24 | 1 | -3/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | pull: handle git-fetch's options as well | Paul Tan | 2015-06-02 | 1 | -3/+0 |
* | | | | | | | | | Merge branch 'qn/blame-show-email' | Junio C Hamano | 2015-06-24 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | blame: add blame.showEmail configuration | Quentin Neill | 2015-06-02 | 1 | -0/+2 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'es/send-email-sendmail-alias' | Junio C Hamano | 2015-06-24 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | send-email: implement sendmail aliases line continuation support | Eric Sunshine | 2015-06-02 | 1 | -2/+0 |
| * | | | | | | | | | send-email: further document missing sendmail aliases functionality | Eric Sunshine | 2015-06-02 | 1 | -0/+3 |
* | | | | | | | | | | Eighth batch for 2.5 | Junio C Hamano | 2015-06-16 | 1 | -1/+11 |
* | | | | | | | | | | Sync with 2.4.4 | Junio C Hamano | 2015-06-16 | 2 | -1/+37 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Git 2.4.4v2.4.4 | Junio C Hamano | 2015-06-16 | 2 | -1/+37 |
| * | | | | | | | | | Merge branch 'sb/submodule-doc-intro' into maint | Junio C Hamano | 2015-06-16 | 1 | -28/+22 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'sb/glossary-submodule' into maint | Junio C Hamano | 2015-06-16 | 1 | -0/+16 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'mc/commit-doc-grammofix' into maint | Junio C Hamano | 2015-06-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/http-backend-deadlock' into maint | Junio C Hamano | 2015-06-16 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/log-format-raw-doc' into maint | Junio C Hamano | 2015-06-16 | 2 | -2/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/pack-protocol-mention-smart-http' | Junio C Hamano | 2015-06-16 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Documentation/technical/pack-protocol: mention http as possible protocol | Stefan Beller | 2015-06-02 | 1 | -3/+3 |
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'sg/merge-summary-config' | Junio C Hamano | 2015-06-16 | 3 | -16/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Documentation: include 'merge.branchdesc' for merge and config as well | SZEDER Gábor | 2015-05-28 | 3 | -16/+12 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'ah/send-email-sendmail-alias' | Junio C Hamano | 2015-06-16 | 1 | -1/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | send-email: add sendmail email aliases format | Allen Hubbe | 2015-05-27 | 1 | -1/+17 |
* | | | | | | | | | | | | | Second half of seventh batch | Junio C Hamano | 2015-06-11 | 1 | -0/+28 |
* | | | | | | | | | | | | | Merge branch 'sb/glossary-submodule' | Junio C Hamano | 2015-06-11 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | glossary: add "remote", "submodule", "superproject" | Stefan Beller | 2015-05-29 | 1 | -0/+16 |
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'sb/submodule-doc-intro' | Junio C Hamano | 2015-06-11 | 1 | -28/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | submodule doc: reorder introductory paragraphs | Stefan Beller | 2015-05-29 | 1 | -28/+22 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'jk/color-diff-plain-is-context' | Junio C Hamano | 2015-06-11 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | diff: accept color.diff.context as a synonym for "plain" | Jeff King | 2015-05-27 | 1 | -1/+2 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jc/diff-ws-error-highlight' | Junio C Hamano | 2015-06-11 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | diff.c: --ws-error-highlight=<kind> option | Junio C Hamano | 2015-05-27 | 1 | -0/+10 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Sync with 2.4.3 | Junio C Hamano | 2015-06-05 | 2 | -1/+78 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Git 2.4.3v2.4.3 | Junio C Hamano | 2015-06-05 | 2 | -1/+78 |
| * | | | | | | | | | Merge branch 'ps/doc-packfile-vs-pack-file' into maint | Junio C Hamano | 2015-06-05 | 3 | -9/+9 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'fg/document-commit-message-stripping' into maint | Junio C Hamano | 2015-06-05 | 1 | -4/+7 |
| |\ \ \ \ \ \ \ \ \ \ |