summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Fourteenth batch for 2.14Junio C Hamano2017-07-051-0/+12
* Thirteenth batch for 2.14Junio C Hamano2017-06-301-0/+23
* Merge branch 'vs/typofixes'Junio C Hamano2017-06-305-5/+5
|\
| * Spelling fixesvs/typofixesVille Skyttä2017-06-275-5/+5
* | Merge branch 'ah/doc-pretty-color-auto-prefix'Junio C Hamano2017-06-301-5/+6
|\ \
| * | doc: clarify syntax for %C(auto,...) in pretty formatsah/doc-pretty-color-auto-prefixAndreas Heiduk2017-06-241-5/+6
* | | Merge branch 'ks/submodule-add-doc'Junio C Hamano2017-06-301-28/+21
|\ \ \ | |_|/ |/| |
| * | Documentation/git-submodule: cleanup "add" sectionks/submodule-add-docKaartic Sivaraam2017-06-221-28/+21
* | | Twelfth batch for 2.14Junio C Hamano2017-06-261-1/+11
* | | Merge branch 'dt/raise-core-packed-git-limit'Junio C Hamano2017-06-261-1/+2
|\ \ \
| * | | docs: update 64-bit core.packedGitLimit defaultdt/raise-core-packed-git-limitJeff King2017-06-211-1/+2
* | | | Merge branch 'lb/status-stash-count'Junio C Hamano2017-06-267-35/+49
|\ \ \ \
| * | | | glossary: define 'stash entry'lb/status-stash-countLiam Beguin2017-06-181-0/+4
| * | | | status: add optional stash count informationLiam Beguin2017-06-182-0/+8
| * | | | stash: update documentation to use 'stash entry'Liam Beguin2017-06-185-35/+37
* | | | | Sync with 2.13.2Junio C Hamano2017-06-242-12/+17
|\ \ \ \ \
| * | | | | Git 2.13.2v2.13.2Junio C Hamano2017-06-241-0/+17
| * | | | | Merge branch 'sn/reset-doc-typofix' into maintJunio C Hamano2017-06-241-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'sg/doc-pretty-formats' into maintJunio C Hamano2017-06-241-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'sb/submodule-rm-absorb' into maintJunio C Hamano2017-06-241-4/+5
| |\ \ \ \ \ \ \
* | | | | | | | | Eleventh batch for 2.14Junio C Hamano2017-06-241-15/+46
* | | | | | | | | Merge branch 'jk/warn-add-gitlink'Junio C Hamano2017-06-242-0/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add: warn when adding an embedded repositoryJeff King2017-06-152-0/+10
* | | | | | | | | | Merge branch 'sn/reset-doc-typofix'Junio C Hamano2017-06-241-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | doc: git-reset: fix a trivial typosn/reset-doc-typofixŠtěpán Němec2017-06-151-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sg/doc-pretty-formats'Junio C Hamano2017-06-241-2/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | docs/pretty-formats: stress that %- removes all preceding line-feedssg/doc-pretty-formatsSZEDER Gábor2017-06-151-2/+2
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'ah/doc-gitattributes-empty-index'Junio C Hamano2017-06-241-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | doc: do not use `rm .git/index` when normalizing line endingsah/doc-gitattributes-empty-indexAndreas Heiduk2017-06-151-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Tenth batch for 2.14Junio C Hamano2017-06-221-0/+28
* | | | | | | | Merge branch 'rs/strbuf-addftime-zZ'Junio C Hamano2017-06-221-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | strbuf: let strbuf_addftime handle %z and %Z itselfRené Scharfe2017-06-151-1/+2
* | | | | | | | | Merge branch 'mh/fast-import-raise-default-depth'Junio C Hamano2017-06-221-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fast-import: increase the default pack depth to 50mh/fast-import-raise-default-depthMike Hommey2017-06-121-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ah/filter-branch-setup'Junio C Hamano2017-06-221-5/+12
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | filter-branch: add `--setup` stepAndreas Heiduk2017-06-121-5/+12
| |/ / / / / / /
* | | | | | | | Ninth batch for 2.14Junio C Hamano2017-06-191-0/+29
* | | | | | | | Merge branch 'sb/submodule-rm-absorb'Junio C Hamano2017-06-191-4/+5
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Documentation/git-rm: correct submodule descriptionsb/submodule-rm-absorbStefan Beller2017-06-041-4/+5
* | | | | | | | Merge branch 'ab/pcre-v2'Junio C Hamano2017-06-191-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | log: add -P as a synonym for --perl-regexpÆvar Arnfjörð Bjarmason2017-05-261-0/+1
* | | | | | | | git-svn: document special options for commit-diffAndreas Heiduk2017-06-151-0/+15
* | | | | | | | Sync with maintJunio C Hamano2017-06-131-0/+37
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Prepare for 2.13.2cc/subprocess-comment-fixJunio C Hamano2017-06-131-0/+37
| * | | | | | | Merge branch 'ad/pull-remote-doc' into maintJunio C Hamano2017-06-131-3/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'sl/clean-d-ignored-fix' into maintJunio C Hamano2017-06-131-0/+6
| |\ \ \ \ \ \ \ \
* | | | | | | | | | Eighth batch for 2.14Junio C Hamano2017-06-131-14/+21
* | | | | | | | | | Merge branch 'sb/submodule-blanket-recursive'Junio C Hamano2017-06-131-0/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Introduce 'submodule.recurse' option for worktree manipulatorsStefan Beller2017-06-011-0/+5
| * | | | | | | | | Merge branch 'ab/grep-preparatory-cleanup' into sb/submodule-blanket-recursiveJunio C Hamano2017-05-302-4/+11
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |