Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Post 2.3 cyce (batch #10) | Junio C Hamano | 2015-03-17 | 1 | -0/+319 |
* | Merge branch 'mg/doc-status-color-slot' | Junio C Hamano | 2015-03-17 | 1 | -2/+4 |
|\ | |||||
| * | config,completion: add color.status.unmergedmg/doc-status-color-slot | Michael J Gruber | 2015-03-10 | 1 | -2/+4 |
* | | Merge branch 'mg/status-v-v' | Junio C Hamano | 2015-03-17 | 1 | -0/+4 |
|\ \ | |||||
| * | | commit/status: show the index-worktree diff with -v -v | Michael J Gruber | 2015-03-06 | 1 | -0/+4 |
| |/ | |||||
* | | Sync with 2.3.3 | Junio C Hamano | 2015-03-13 | 2 | -1/+41 |
|\ \ | |||||
| * | | Git 2.3.3v2.3.3 | Junio C Hamano | 2015-03-13 | 2 | -1/+41 |
| * | | Merge branch 'mr/doc-clean-f-f' into maint | Junio C Hamano | 2015-03-13 | 1 | -2/+6 |
| |\ \ | |||||
| * \ \ | Merge branch 'mg/doc-remote-tags-or-not' into maint | Junio C Hamano | 2015-03-13 | 1 | -0/+3 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'ms/submodule-update-config-doc' into maint | Junio C Hamano | 2015-03-13 | 3 | -37/+64 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jc/apply-beyond-symlink' into maint | Junio C Hamano | 2015-03-13 | 1 | -1/+11 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'mh/expire-updateref-fixes' | Junio C Hamano | 2015-03-10 | 1 | -58/+86 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | reflog_expire(): ignore --updateref for symbolic references | Michael Haggerty | 2015-03-05 | 1 | -1/+2 |
| * | | | | | | | reflog: improve and update documentation | Michael Haggerty | 2015-03-05 | 1 | -58/+85 |
| * | | | | | | | Merge branch 'sb/atomic-push' into mh/ref-trans-value-check | Junio C Hamano | 2015-02-09 | 4 | -4/+28 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ms/submodule-update-config-doc' | Junio C Hamano | 2015-03-06 | 3 | -37/+64 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | submodule: improve documentation of update subcommandms/submodule-update-config-doc | Michal Sojka | 2015-03-02 | 3 | -37/+64 |
* | | | | | | | | Merge branch 'mg/doc-remote-tags-or-not' | Junio C Hamano | 2015-03-06 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | git-remote.txt: describe behavior without --tags and --no-tagsmg/doc-remote-tags-or-not | Michael J Gruber | 2015-03-02 | 1 | -0/+3 |
* | | | | | | | | Merge branch 'mr/doc-clean-f-f' | Junio C Hamano | 2015-03-06 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Documentation/git-clean.txt: document that -f may need to be given twicemr/doc-clean-f-f | Mikko Rapeli | 2015-02-26 | 1 | -2/+6 |
* | | | | | | | | Sync with 2.3.2 | Junio C Hamano | 2015-03-06 | 2 | -1/+13 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | Git 2.3.2v2.3.2 | Junio C Hamano | 2015-03-06 | 2 | -1/+13 |
| * | | | | | | | Merge branch 'mm/am-c-doc' into maint | Junio C Hamano | 2015-03-06 | 2 | -1/+9 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Sync with maint | Junio C Hamano | 2015-03-05 | 1 | -0/+68 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Prepare for 2.3.2 | Junio C Hamano | 2015-03-05 | 1 | -0/+68 |
| * | | | | | | | | Merge branch 'jc/conf-var-doc' into maint | Junio C Hamano | 2015-03-05 | 2 | -8/+30 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/remote-set-url-doc' into maint | Junio C Hamano | 2015-03-05 | 1 | -6/+14 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'mm/am-c-doc' | Junio C Hamano | 2015-03-05 | 2 | -1/+9 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Documentation/git-am.txt: mention mailinfo.scissors config variablemm/am-c-doc | Matthieu Moy | 2015-02-20 | 1 | -1/+2 |
| * | | | | | | | | | Documentation/config.txt: document mailinfo.scissors | Matthieu Moy | 2015-02-20 | 1 | -0/+7 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jc/apply-beyond-symlink' | Junio C Hamano | 2015-03-03 | 1 | -1/+11 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | apply: reject input that touches outside the working area | Junio C Hamano | 2015-02-10 | 1 | -1/+11 |
* | | | | | | | | | Merge branch 'jk/strbuf-doc-to-header' | Junio C Hamano | 2015-02-25 | 1 | -351/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | strbuf.h: integrate api-strbuf.txt documentation | Jeff King | 2015-01-16 | 1 | -351/+0 |
* | | | | | | | | | | Merge branch 'jn/doc-api-errors' | Junio C Hamano | 2015-02-25 | 1 | -0/+75 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | doc: document error handling functions and conventions | Jonathan Nieder | 2014-12-04 | 1 | -0/+75 |
* | | | | | | | | | | | Sync with 2.3.1 | Junio C Hamano | 2015-02-24 | 2 | -1/+54 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Git 2.3.1v2.3.1 | Junio C Hamano | 2015-02-24 | 2 | -1/+54 |
| * | | | | | | | | | | Merge branch 'jc/doc-log-rev-list-options' into maint | Junio C Hamano | 2015-02-24 | 1 | -5/+7 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/diff-format-doc' into maint | Junio C Hamano | 2015-02-24 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mg/push-repo-option-doc' into maint | Junio C Hamano | 2015-02-24 | 1 | -16/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'jc/conf-var-doc' | Junio C Hamano | 2015-02-22 | 2 | -8/+30 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | CodingGuidelines: describe naming rules for configuration variablesjc/conf-var-doc | Junio C Hamano | 2015-02-02 | 1 | -0/+23 |
| * | | | | | | | | | | | | config.txt: mark deprecated variables more prominently | Junio C Hamano | 2015-01-28 | 1 | -4/+4 |
| * | | | | | | | | | | | | config.txt: clarify that add.ignore-errors is deprecated | Junio C Hamano | 2015-01-28 | 1 | -5/+4 |
* | | | | | | | | | | | | | Merge branch 'jc/remote-set-url-doc' | Junio C Hamano | 2015-02-18 | 1 | -6/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Documentation/git-remote.txt: stress that set-url is not for triangularjc/remote-set-url-doc | Junio C Hamano | 2015-01-29 | 1 | -6/+14 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'mg/push-repo-option-doc' | Junio C Hamano | 2015-02-17 | 1 | -16/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | git-push.txt: document the behavior of --repomg/push-repo-option-doc | Michael J Gruber | 2015-01-28 | 1 | -16/+2 |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | |