summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* rerere: teach rerere to handle nested conflictsThomas Gummerer2018-08-061-0/+42
* rerere: add documentation for conflict normalizationThomas Gummerer2018-08-061-0/+140
* Second batch for 2.19 cycleJunio C Hamano2018-06-281-0/+44
* First batch for 2.19 cycleJunio C Hamano2018-06-251-0/+43
* Merge branch 'nd/complete-config-vars'Junio C Hamano2018-06-252-1/+7
|\
| * log-tree: allow to customize 'grafted' colorNguyễn Thái Ngọc Duy2018-05-291-1/+2
| * help: add --config to list all available configNguyễn Thái Ngọc Duy2018-05-291-0/+5
| * Merge branch 'nd/command-list' into nd/complete-config-varsJunio C Hamano2018-05-296-4/+24
| |\
* | \ Merge branch 'jk/show-index'Junio C Hamano2018-06-251-6/+20
|\ \ \
| * | | show-index: update documentation for index v2Jeff King2018-05-291-6/+20
* | | | Merge branch 'nd/diff-apply-ita'Junio C Hamano2018-06-251-1/+9
|\ \ \ \
| * | | | apply: add --intent-to-addNguyễn Thái Ngọc Duy2018-05-291-1/+9
* | | | | Merge branch 'ds/commit-graph-lockfile-fix'Junio C Hamano2018-06-251-5/+24
|\ \ \ \ \
| * | | | | commit-graph.txt: update design documentDerrick Stolee2018-05-221-5/+24
* | | | | | Merge branch 'pc/submodule-helper-foreach'Junio C Hamano2018-06-251-5/+10
|\ \ \ \ \ \
| * | | | | | submodule foreach: document variable '$displaypath'Prathamesh Chavan2018-05-091-3/+5
| * | | | | | submodule foreach: document '$sm_path' instead of '$path'Prathamesh Chavan2018-05-091-4/+7
| | |/ / / / | |/| | | |
* | | | | | Prepare to start 2.19 cycleJunio C Hamano2018-06-251-0/+14
* | | | | | doc: fix typos in documentation and release notesKarthikeyan Singaravelan2018-06-194-4/+4
* | | | | | Almost 2.18 finalJunio C Hamano2018-06-181-0/+11
* | | | | | A bunch of micro-fixes before going 2.18 finalJunio C Hamano2018-06-181-0/+11
* | | | | | Merge branch 'mw/doc-merge-enumfix'Junio C Hamano2018-06-181-1/+1
|\ \ \ \ \ \
| * | | | | | doc: update the order of the syntax `git merge --continue`Meng-Sung Wu2018-06-141-1/+1
* | | | | | | Merge branch 'rd/doc-remote-tracking-with-hyphen'Junio C Hamano2018-06-181-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Use hyphenated "remote-tracking branch" (docs and comments)Robert P. J. Day2018-06-131-2/+2
* | | | | | | | Merge branch 'km/doc-workflows-typofix'Junio C Hamano2018-06-181-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | gitworkflows: fix grammar in 'Merge upwards' ruleKyle Meyer2018-06-121-1/+1
* | | | | | | | | Merge branch 'ld/git-p4-updates'Junio C Hamano2018-06-181-0/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-p4: add option to disable syncing of p4/master with p4Luke Diamand2018-06-121-0/+8
| * | | | | | | | | git-p4: disable-rebase: allow setting this via configurationLuke Diamand2018-06-121-1/+4
| * | | | | | | | | git-p4: add options --commit and --disable-rebaseRomain Merland2018-06-121-0/+14
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rd/diff-options-typofix'Junio C Hamano2018-06-181-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff-options.txt: fix minor typos, font inconsistencies, in docsRobert P. J. Day2018-06-111-4/+4
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | RelNotes 2.18: minor fix to entry about dynamically loading completionsSZEDER Gábor2018-06-181-1/+1
* | | | | | | | | Git 2.18-rc2v2.18.0-rc2Junio C Hamano2018-06-131-0/+6
* | | | | | | | | RelNotes 2.18: clarify where directory rename detection appliesElijah Newren2018-06-131-1/+1
* | | | | | | | | RelNotes 2.18: typofixesJunio C Hamano2018-06-111-2/+2
* | | | | | | | | Git 2.18-rc1v2.18.0-rc1Junio C Hamano2018-06-041-0/+12
* | | | | | | | | Merge branch 'tg/doc-sec-list'Junio C Hamano2018-06-041-4/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | note git-security@googlegroups.com in more placesThomas Gummerer2018-06-011-0/+13
| * | | | | | | | | SubmittingPatches: replace numbered attributes with namesThomas Gummerer2018-06-011-4/+4
* | | | | | | | | | Merge branch 'rd/p4-doc-markup-env'Junio C Hamano2018-06-041-5/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | p4.txt: Use backquotes for variable namesRobert P. J. Day2018-06-011-5/+5
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'nd/remote-update-doc'Junio C Hamano2018-06-041-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | remote: doc typofixDuy Nguyen2018-06-041-1/+1
| * | | | | | | | | | remote.txt: update documentation for 'update' commandDuy Nguyen2018-06-011-2/+2
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | A bit more topics before -rc1Junio C Hamano2018-06-011-0/+22
* | | | | | | | | | Merge branch 'rd/tag-doc-lightweight'Junio C Hamano2018-06-011-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | tag: clarify in the doc that a tag can refer to a non-commit objectRobert P. J. Day2018-05-291-2/+2
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rd/doc-options-placeholder'Junio C Hamano2018-06-0119-38/+38
|\ \ \ \ \ \ \ \ \ \