Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint-2.5' into maint-2.6 | Junio C Hamano | 2017-05-05 | 3 | -2/+28 |
|\ | |||||
| * | Git 2.5.6v2.5.6maint-2.5 | Junio C Hamano | 2017-05-05 | 2 | -1/+14 |
| * | Merge branch 'maint-2.4' into maint-2.5 | Junio C Hamano | 2017-05-05 | 2 | -1/+14 |
| |\ | |||||
| | * | Git 2.4.12v2.4.12maint-2.4 | Junio C Hamano | 2017-05-05 | 2 | -1/+14 |
* | | | Git 2.6.6v2.6.6 | Junio C Hamano | 2016-03-17 | 2 | -1/+13 |
* | | | Merge branch 'maint-2.5' into maint-2.6 | Junio C Hamano | 2016-03-17 | 3 | -2/+26 |
|\ \ \ | |/ / | |||||
| * | | Git 2.5.5v2.5.5 | Junio C Hamano | 2016-03-17 | 2 | -1/+13 |
| * | | Merge branch 'maint-2.4' into maint-2.5 | Junio C Hamano | 2016-03-17 | 2 | -1/+13 |
| |\ \ | | |/ | |||||
| | * | Git 2.4.11v2.4.11 | Junio C Hamano | 2016-03-17 | 2 | -1/+13 |
* | | | Git 2.6.5v2.6.5 | Junio C Hamano | 2016-01-04 | 2 | -1/+21 |
* | | | Update draft release notes to 2.6.5 | Junio C Hamano | 2015-12-15 | 1 | -0/+14 |
* | | | Merge branch 'ls/p4-keep-empty-commits' into maint | Junio C Hamano | 2015-12-15 | 1 | -0/+4 |
|\ \ \ | |||||
| * | | | git-p4: add option to keep empty commitsls/p4-keep-empty-commits | Lars Schneider | 2015-12-10 | 1 | -0/+4 |
* | | | | Prepare for 2.6.5 | Junio C Hamano | 2015-12-11 | 1 | -0/+25 |
* | | | | Merge branch 'sb/doc-submodule-sync-recursive' into maint | Junio C Hamano | 2015-12-11 | 1 | -1/+4 |
|\ \ \ \ | |||||
| * | | | | document submodule sync --recursivesb/doc-submodule-sync-recursive | Stefan Beller | 2015-12-04 | 1 | -1/+4 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'nd/doc-check-ref-format-typo' into maint | Junio C Hamano | 2015-12-11 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | git-check-ref-format.txt: typo, s/avoids/avoid/nd/doc-check-ref-format-typo | Nguyễn Thái Ngọc Duy | 2015-12-04 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Documentation/git-update-index: add missing opts to synopsis | Christian Couder | 2015-12-10 | 1 | -0/+1 |
* | | | | Git 2.6.4v2.6.4 | Junio C Hamano | 2015-12-08 | 2 | -1/+17 |
* | | | | Merge branch 'jk/rebase-no-autostash' into maint | Junio C Hamano | 2015-12-08 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | Documentation/git-rebase: fix --no-autostash formattingjk/rebase-no-autostash | John Keeping | 2015-09-10 | 1 | -1/+2 |
* | | | | | Prepare for 2.6.4 | Junio C Hamano | 2015-12-04 | 1 | -0/+48 |
* | | | | | Merge branch 'dk/check-ignore-docs' into maint | Jeff King | 2015-12-01 | 1 | -5/+5 |
|\ \ \ \ \ | |||||
| * | | | | | check-ignore: correct documentation about outputdk/check-ignore-docs | Dennis Kaarsemaker | 2015-11-24 | 1 | -5/+5 |
* | | | | | | Merge branch 'mg/doc-word-diff-example' into maint | Jeff King | 2015-12-01 | 1 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation/diff: give --word-diff-regex=. examplemg/doc-word-diff-example | Michael J Gruber | 2015-11-24 | 1 | -0/+3 |
* | | | | | | | Merge branch 'ar/doc-env-variable-format' into maint | Jeff King | 2015-12-01 | 1 | -6/+6 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Documentation: make environment variable formatting more consistentar/doc-env-variable-format | Андрей Рыбак | 2015-11-11 | 1 | -6/+6 |
| |/ / / / / | |||||
* | | | | | | Documentation/git-update-index: add missing opts to synopsys | Christian Couder | 2015-11-24 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Git 2.6.3v2.6.3 | Junio C Hamano | 2015-11-05 | 2 | -1/+113 |
* | | | | | Merge branch 'rs/daemon-plug-child-leak' into maint | Junio C Hamano | 2015-11-05 | 1 | -0/+7 |
|\ \ \ \ \ | |||||
| * | | | | | run-command: factor out child_process_clear() | René Scharfe | 2015-11-02 | 1 | -0/+7 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'xf/user-manual-ff' into maint | Junio C Hamano | 2015-11-04 | 1 | -5/+5 |
|\ \ \ \ \ | |||||
| * | | | | | user-manual: fix the description of fast-forwardxf/user-manual-ff | Xue Fuqiao | 2015-10-26 | 1 | -5/+5 |
* | | | | | | Merge branch 'xf/user-manual-markup' into maint | Junio C Hamano | 2015-11-04 | 11 | -11/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation: match undefline with the text in old release notesxf/user-manual-markup | Junio C Hamano | 2015-10-22 | 5 | -5/+5 |
| * | | | | | | Documentation: match underline with the text | Junio C Hamano | 2015-10-22 | 5 | -5/+5 |
| * | | | | | | Documentation: fix header markup | Xue Fuqiao | 2015-10-22 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jc/everyday-markup' into maint | Junio C Hamano | 2015-11-04 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation/everyday: match undefline with the textjc/everyday-markup | Junio C Hamano | 2015-10-22 | 1 | -1/+1 |
* | | | | | | | Merge branch 'jc/em-dash-in-doc' into maint | Junio C Hamano | 2015-11-04 | 6 | -6/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Documentation: AsciiDoc spells em-dash as double-dashes, not triplejc/em-dash-in-doc | Junio C Hamano | 2015-10-22 | 6 | -6/+6 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/merge-file-exit-code' into maint | Junio C Hamano | 2015-11-03 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | merge-file: clamp exit code to maximum 127jk/merge-file-exit-code | Jeff King | 2015-10-29 | 1 | -1/+2 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jc/usage-stdin' into maint | Junio C Hamano | 2015-11-03 | 13 | -28/+51 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | usage: do not insist that standard input must come from a filejc/usage-stdin | Junio C Hamano | 2015-10-16 | 13 | -28/+51 |
* | | | | | | | | Merge branch 'jk/repository-extension' into maint | Junio C Hamano | 2015-11-03 | 1 | -0/+88 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | introduce "preciousObjects" repository extensionjk/repository-extension | Jeff King | 2015-06-24 | 1 | -0/+7 |
| * | | | | | | | | introduce "extensions" form of core.repositoryformatversion | Jeff King | 2015-06-24 | 1 | -0/+81 |