summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Sync with 2.3.2Junio C Hamano2015-03-062-1/+13
|\
| * Git 2.3.2v2.3.2Junio C Hamano2015-03-062-1/+13
| * Merge branch 'mm/am-c-doc' into maintJunio C Hamano2015-03-062-1/+9
| |\
* | \ Sync with maintJunio C Hamano2015-03-051-0/+68
|\ \ \ | |/ /
| * | Prepare for 2.3.2Junio C Hamano2015-03-051-0/+68
| * | Merge branch 'jc/conf-var-doc' into maintJunio C Hamano2015-03-052-8/+30
| |\ \
| * \ \ Merge branch 'jc/remote-set-url-doc' into maintJunio C Hamano2015-03-051-6/+14
| |\ \ \
* | \ \ \ Merge branch 'mm/am-c-doc'Junio C Hamano2015-03-052-1/+9
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Documentation/git-am.txt: mention mailinfo.scissors config variablemm/am-c-docMatthieu Moy2015-02-201-1/+2
| * | | | Documentation/config.txt: document mailinfo.scissorsMatthieu Moy2015-02-201-0/+7
* | | | | Merge branch 'jc/apply-beyond-symlink'Junio C Hamano2015-03-031-1/+11
|\ \ \ \ \
| * | | | | apply: reject input that touches outside the working areaJunio C Hamano2015-02-101-1/+11
* | | | | | Merge branch 'jk/strbuf-doc-to-header'Junio C Hamano2015-02-251-351/+0
|\ \ \ \ \ \
| * | | | | | strbuf.h: integrate api-strbuf.txt documentationJeff King2015-01-161-351/+0
* | | | | | | Merge branch 'jn/doc-api-errors'Junio C Hamano2015-02-251-0/+75
|\ \ \ \ \ \ \
| * | | | | | | doc: document error handling functions and conventionsJonathan Nieder2014-12-041-0/+75
* | | | | | | | Sync with 2.3.1Junio C Hamano2015-02-242-1/+54
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Git 2.3.1v2.3.1Junio C Hamano2015-02-242-1/+54
| * | | | | | | Merge branch 'jc/doc-log-rev-list-options' into maintJunio C Hamano2015-02-241-5/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/diff-format-doc' into maintJunio C Hamano2015-02-241-1/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'mg/push-repo-option-doc' into maintJunio C Hamano2015-02-241-16/+2
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'jc/conf-var-doc'Junio C Hamano2015-02-222-8/+30
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | CodingGuidelines: describe naming rules for configuration variablesjc/conf-var-docJunio C Hamano2015-02-021-0/+23
| * | | | | | | | | | config.txt: mark deprecated variables more prominentlyJunio C Hamano2015-01-281-4/+4
| * | | | | | | | | | config.txt: clarify that add.ignore-errors is deprecatedJunio C Hamano2015-01-281-5/+4
* | | | | | | | | | | Merge branch 'jc/remote-set-url-doc'Junio C Hamano2015-02-181-6/+14
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Documentation/git-remote.txt: stress that set-url is not for triangularjc/remote-set-url-docJunio C Hamano2015-01-291-6/+14
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'mg/push-repo-option-doc'Junio C Hamano2015-02-171-16/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | git-push.txt: document the behavior of --repomg/push-repo-option-docMichael J Gruber2015-01-281-16/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/diff-format-doc'Junio C Hamano2015-02-171-1/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | diff-format doc: a score can follow M for rewritejc/diff-format-docJunio C Hamano2015-01-281-1/+2
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'jc/doc-log-rev-list-options'Junio C Hamano2015-02-171-5/+7
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Documentation: what does "git log --indexed-objects" even mean?jc/doc-log-rev-list-optionsJunio C Hamano2015-01-231-5/+7
* | | | | | | | Merge branch 'ah/usage-strings'Junio C Hamano2015-02-111-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | standardize usage info string formatAlex Henrie2015-01-141-2/+6
* | | | | | | | | Merge branch 'jc/pretty-format-doc'Junio C Hamano2015-02-111-3/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | "log --pretty" documentation: do not forget "tformat:"jc/pretty-format-docJunio C Hamano2015-01-151-3/+7
* | | | | | | | | | Merge branch 'jc/push-to-checkout'Junio C Hamano2015-02-112-1/+35
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | receive-pack: support push-to-checkout hookjc/push-to-checkoutJunio C Hamano2015-01-082-1/+35
* | | | | | | | | | | Merge branch 'sb/atomic-push'Junio C Hamano2015-02-114-4/+28
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Document receive.advertiseatomicStefan Beller2015-01-141-0/+5
| * | | | | | | | | | | push.c: add an --atomic argumentRonnie Sahlberg2015-01-071-1/+6
| * | | | | | | | | | | send-pack.c: add --atomic command line argumentRonnie Sahlberg2015-01-071-1/+6
| * | | | | | | | | | | receive-pack.c: negotiate atomic push supportRonnie Sahlberg2015-01-071-2/+11
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'cj/log-invert-grep'Junio C Hamano2015-02-111-0/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | log: teach --invert-grep optioncj/log-invert-grepChristoph Junghans2015-01-131-0/+4
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ld/p4-exclude-in-sync'Junio C Hamano2015-02-111-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-p4: support excluding paths on syncld/p4-exclude-in-syncLuke Diamand2015-02-111-3/+3
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/coding-guidelines'Junio C Hamano2015-02-111-3/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | CodingGuidelines: clarify C #include rulesjc/coding-guidelinesJunio C Hamano2015-01-151-3/+8