summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/blame-color'Junio C Hamano2018-05-301-0/+27
|\
| * builtin/blame: add new coloring scheme configStefan Beller2018-04-241-0/+5
| * builtin/blame: highlight recently changed linesStefan Beller2018-04-241-0/+17
| * builtin/blame: dim uninteresting metadata linesStefan Beller2018-04-241-0/+5
* | Merge branch 'cf/submodule-progress-dissociate'Junio C Hamano2018-05-301-1/+16
|\ \
| * | submodule: add --dissociate option to add/update commandsCasey Fitzpatrick2018-05-221-1/+9
| * | submodule: add --progress option to add commandCasey Fitzpatrick2018-05-221-0/+7
* | | Merge branch 'bp/status-rename-config'Junio C Hamano2018-05-302-0/+22
|\ \ \
| * | | add status config and command line options for rename detectionBen Peart2018-05-132-0/+22
* | | | Merge branch 'bp/merge-rename-config'Junio C Hamano2018-05-303-6/+16
|\ \ \ \
| * | | | merge: add merge.renames config settingBen Peart2018-05-082-4/+12
| * | | | merge: update documentation for {merge,diff}.renameLimitBen Peart2018-05-082-2/+4
* | | | | Sync with Git 2.17.1Junio C Hamano2018-05-295-0/+49
|\ \ \ \ \
| * | | | | Git 2.17.1v2.17.1Junio C Hamano2018-05-221-0/+16
| * | | | | Sync with Git 2.16.4Junio C Hamano2018-05-224-0/+33
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Git 2.16.4v2.16.4Junio C Hamano2018-05-221-0/+5
| | * | | | Sync with Git 2.15.2Junio C Hamano2018-05-223-0/+28
| | |\ \ \ \
| | | * | | | Git 2.15.2v2.15.2Junio C Hamano2018-05-221-0/+3
| | | * | | | Sync with Git 2.14.4Junio C Hamano2018-05-222-0/+25
| | | |\ \ \ \
| | | | * | | | Git 2.14.4v2.14.4Junio C Hamano2018-05-221-0/+5
| | | | * | | | Sync with Git 2.13.7Junio C Hamano2018-05-221-0/+20
| | | | |\ \ \ \
| | | | | * | | | Git 2.13.7v2.13.7Junio C Hamano2018-05-221-0/+20
* | | | | | | | | The sixth batch for 2.18Junio C Hamano2018-05-231-0/+101
* | | | | | | | | Merge branch 'bc/asciidoctor-tab-width'Junio C Hamano2018-05-232-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: render revisions correctly under Asciidoctorbrian m. carlson2018-05-071-0/+2
| * | | | | | | | | Documentation: use 8-space tabs with Asciidoctorbrian m. carlson2018-05-071-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'nd/pack-unreachable-objects-doc'Junio C Hamano2018-05-231-0/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pack-objects: validation and documentation about unreachable optionsNguyễn Thái Ngọc Duy2018-05-061-0/+13
| |/ / / / / / / /
* | | | | | | | | Merge branch 'ah/misc-doc-updates'Junio C Hamano2018-05-236-68/+77
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | doc: normalize [--options] to [options] in git-diffAndreas Heiduk2018-05-061-7/+7
| * | | | | | | | | doc: add note about shell quoting to revision.txtAndreas Heiduk2018-05-061-0/+6
| * | | | | | | | | git-svn: remove ''--add-author-from' for 'commit-diff'Andreas Heiduk2018-05-061-1/+1
| * | | | | | | | | doc: add '-d' and '-o' for 'git push'Andreas Heiduk2018-05-061-1/+2
| * | | | | | | | | doc: clarify ignore rules for git ls-filesAndreas Heiduk2018-05-061-1/+2
| * | | | | | | | | doc: align 'diff --no-index' in text and synopsisAndreas Heiduk2018-05-061-2/+2
| * | | | | | | | | doc: improve formatting in githooks.txtAndreas Heiduk2018-05-061-57/+58
| |/ / / / / / / /
* | | | | | | | | Merge branch 'nd/doc-header'Junio C Hamano2018-05-2338-96/+96
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | doc: keep first level section header in upper caseNguyễn Thái Ngọc Duy2018-05-0238-96/+96
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'js/rebase-recreate-merge'Junio C Hamano2018-05-233-2/+175
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase -i --rebase-merges: add a section to the man pageJohannes Schindelin2018-04-261-0/+135
| * | | | | | | | | rebase -i: introduce --rebase-merges=[no-]rebase-cousinsJohannes Schindelin2018-04-261-4/+11
| * | | | | | | | | pull: accept --rebase=merges to recreate the branch topologyJohannes Schindelin2018-04-262-1/+13
| * | | | | | | | | rebase: introduce the --rebase-merges optionJohannes Schindelin2018-04-261-1/+20
| |/ / / / / / / /
* | | | | | | | | Merge branch 'nd/pack-objects-pack-struct'Junio C Hamano2018-05-233-3/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pack-objects: shrink z_delta_size field in struct object_entryNguyễn Thái Ngọc Duy2018-04-161-1/+2
| * | | | | | | | | pack-objects: use bitfield for object_entry::depthNguyễn Thái Ngọc Duy2018-04-163-2/+7
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'js/no-pager-shorthand'Junio C Hamano2018-05-231-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git: add -P as a short option for --no-pagerJohannes Sixt2018-05-041-1/+2
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'tg/worktree-add-existing-branch'Junio C Hamano2018-05-231-2/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | worktree: teach "add" to check out existing branchesThomas Gummerer2018-04-301-2/+7