aboutsummaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAge
* Eighth batch for 2.5Junio C Hamano2015-06-16
* Sync with 2.4.4Junio C Hamano2015-06-16
|\
| * Git 2.4.4v2.4.4Junio C Hamano2015-06-16
| * Merge branch 'sb/submodule-doc-intro' into maintJunio C Hamano2015-06-16
| |\
| * \ Merge branch 'sb/glossary-submodule' into maintJunio C Hamano2015-06-16
| |\ \
| * \ \ Merge branch 'mc/commit-doc-grammofix' into maintJunio C Hamano2015-06-16
| |\ \ \
| * \ \ \ Merge branch 'jk/http-backend-deadlock' into maintJunio C Hamano2015-06-16
| |\ \ \ \
| * \ \ \ \ Merge branch 'mm/log-format-raw-doc' into maintJunio C Hamano2015-06-16
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'sb/pack-protocol-mention-smart-http'Junio C Hamano2015-06-16
|\ \ \ \ \ \ \
| * | | | | | | Documentation/technical/pack-protocol: mention http as possible protocolStefan Beller2015-06-02
* | | | | | | | Merge branch 'sg/merge-summary-config'Junio C Hamano2015-06-16
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: include 'merge.branchdesc' for merge and config as wellSZEDER Gábor2015-05-28
| |/ / / / / / /
* | | | | | | | Merge branch 'ah/send-email-sendmail-alias'Junio C Hamano2015-06-16
|\ \ \ \ \ \ \ \
| * | | | | | | | send-email: add sendmail email aliases formatAllen Hubbe2015-05-27
* | | | | | | | | Second half of seventh batchJunio C Hamano2015-06-11
* | | | | | | | | Merge branch 'sb/glossary-submodule'Junio C Hamano2015-06-11
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | glossary: add "remote", "submodule", "superproject"Stefan Beller2015-05-29
* | | | | | | | | Merge branch 'sb/submodule-doc-intro'Junio C Hamano2015-06-11
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | submodule doc: reorder introductory paragraphsStefan Beller2015-05-28
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/color-diff-plain-is-context'Junio C Hamano2015-06-11
|\ \ \ \ \ \ \ \
| * | | | | | | | diff: accept color.diff.context as a synonym for "plain"Jeff King2015-05-27
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano2015-06-11
|\ \ \ \ \ \ \ \
| * | | | | | | | diff.c: --ws-error-highlight=<kind> optionJunio C Hamano2015-05-26
| |/ / / / / / /
* | | | | | | | Sync with 2.4.3Junio C Hamano2015-06-05
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Git 2.4.3v2.4.3Junio C Hamano2015-06-05
| * | | | | | | Merge branch 'ps/doc-packfile-vs-pack-file' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'fg/document-commit-message-stripping' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'pt/pull-ff-vs-merge-ff' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ja/tutorial-asciidoctor-fix' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/stripspace-asciidoctor-fix' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/asciidoc-markup-fix' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/xdg-config-path' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | The first half of the seventh batch for 2.5Junio C Hamano2015-06-05
* | | | | | | | | | | | | | | Merge branch 'bc/object-id'Junio C Hamano2015-06-05
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | each_ref_fn: change to take an object_id parameterMichael Haggerty2015-05-25
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/at-push-sha1'Junio C Hamano2015-06-05
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | for-each-ref: accept "%(push)" formatJeff King2015-05-22
| * | | | | | | | | | | | | | | sha1_name: implement @{push} shorthandJeff King2015-05-22
| * | | | | | | | | | | | | | | remote.c: drop "remote" pointer from "struct branch"Jeff King2015-05-21
* | | | | | | | | | | | | | | | Sixth batch for 2.5 cycleJunio C Hamano2015-06-01
* | | | | | | | | | | | | | | | Merge branch 'fm/fetch-raw-sha1'Junio C Hamano2015-06-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | upload-pack: optionally allow fetching reachable sha1Fredrik Medley2015-05-22
| * | | | | | | | | | | | | | | | config.txt: clarify allowTipSHA1InWant with camelCaseFredrik Medley2015-05-21
| | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'sg/help-group'Junio C Hamano2015-06-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | command-list.txt: add the common groups blockSébastien Guimmara2015-05-21
| * | | | | | | | | | | | | | | | command-list: prepare machinery for upcoming "common groups" sectionEric Sunshine2015-05-21
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'mm/log-format-raw-doc'Junio C Hamano2015-06-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Documentation/log: clarify sha1 non-abbreviation in log --rawMatthieu Moy2015-05-20
| * | | | | | | | | | | | | | | Documentation/log: clarify what --raw meansMatthieu Moy2015-05-18
* | | | | | | | | | | | | | | | Merge branch 'dt/cat-file-follow-symlinks'Junio C Hamano2015-06-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \