Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sb/blame-color' | Junio C Hamano | 2018-05-30 | 1 | -0/+27 |
|\ | |||||
| * | builtin/blame: add new coloring scheme config | Stefan Beller | 2018-04-24 | 1 | -0/+5 |
| * | builtin/blame: highlight recently changed lines | Stefan Beller | 2018-04-24 | 1 | -0/+17 |
| * | builtin/blame: dim uninteresting metadata lines | Stefan Beller | 2018-04-24 | 1 | -0/+5 |
* | | Merge branch 'cf/submodule-progress-dissociate' | Junio C Hamano | 2018-05-30 | 1 | -1/+16 |
|\ \ | |||||
| * | | submodule: add --dissociate option to add/update commands | Casey Fitzpatrick | 2018-05-22 | 1 | -1/+9 |
| * | | submodule: add --progress option to add command | Casey Fitzpatrick | 2018-05-22 | 1 | -0/+7 |
* | | | Merge branch 'bp/status-rename-config' | Junio C Hamano | 2018-05-30 | 2 | -0/+22 |
|\ \ \ | |||||
| * | | | add status config and command line options for rename detection | Ben Peart | 2018-05-13 | 2 | -0/+22 |
* | | | | Merge branch 'bp/merge-rename-config' | Junio C Hamano | 2018-05-30 | 3 | -6/+16 |
|\ \ \ \ | |||||
| * | | | | merge: add merge.renames config setting | Ben Peart | 2018-05-08 | 2 | -4/+12 |
| * | | | | merge: update documentation for {merge,diff}.renameLimit | Ben Peart | 2018-05-08 | 2 | -2/+4 |
* | | | | | Sync with Git 2.17.1 | Junio C Hamano | 2018-05-29 | 5 | -0/+49 |
|\ \ \ \ \ | |||||
| * | | | | | Git 2.17.1v2.17.1 | Junio C Hamano | 2018-05-22 | 1 | -0/+16 |
| * | | | | | Sync with Git 2.16.4 | Junio C Hamano | 2018-05-22 | 4 | -0/+33 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | Git 2.16.4v2.16.4 | Junio C Hamano | 2018-05-22 | 1 | -0/+5 |
| | * | | | | Sync with Git 2.15.2 | Junio C Hamano | 2018-05-22 | 3 | -0/+28 |
| | |\ \ \ \ | |||||
| | | * | | | | Git 2.15.2v2.15.2 | Junio C Hamano | 2018-05-22 | 1 | -0/+3 |
| | | * | | | | Sync with Git 2.14.4 | Junio C Hamano | 2018-05-22 | 2 | -0/+25 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Git 2.14.4v2.14.4 | Junio C Hamano | 2018-05-22 | 1 | -0/+5 |
| | | | * | | | | Sync with Git 2.13.7 | Junio C Hamano | 2018-05-22 | 1 | -0/+20 |
| | | | |\ \ \ \ | |||||
| | | | | * | | | | Git 2.13.7v2.13.7 | Junio C Hamano | 2018-05-22 | 1 | -0/+20 |
* | | | | | | | | | The sixth batch for 2.18 | Junio C Hamano | 2018-05-23 | 1 | -0/+101 |
* | | | | | | | | | Merge branch 'bc/asciidoctor-tab-width' | Junio C Hamano | 2018-05-23 | 2 | -1/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Documentation: render revisions correctly under Asciidoctor | brian m. carlson | 2018-05-07 | 1 | -0/+2 |
| * | | | | | | | | | Documentation: use 8-space tabs with Asciidoctor | brian m. carlson | 2018-05-07 | 1 | -1/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'nd/pack-unreachable-objects-doc' | Junio C Hamano | 2018-05-23 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | pack-objects: validation and documentation about unreachable options | Nguyễn Thái Ngọc Duy | 2018-05-06 | 1 | -0/+13 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'ah/misc-doc-updates' | Junio C Hamano | 2018-05-23 | 6 | -68/+77 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | doc: normalize [--options] to [options] in git-diff | Andreas Heiduk | 2018-05-06 | 1 | -7/+7 |
| * | | | | | | | | | doc: add note about shell quoting to revision.txt | Andreas Heiduk | 2018-05-06 | 1 | -0/+6 |
| * | | | | | | | | | git-svn: remove ''--add-author-from' for 'commit-diff' | Andreas Heiduk | 2018-05-06 | 1 | -1/+1 |
| * | | | | | | | | | doc: add '-d' and '-o' for 'git push' | Andreas Heiduk | 2018-05-06 | 1 | -1/+2 |
| * | | | | | | | | | doc: clarify ignore rules for git ls-files | Andreas Heiduk | 2018-05-06 | 1 | -1/+2 |
| * | | | | | | | | | doc: align 'diff --no-index' in text and synopsis | Andreas Heiduk | 2018-05-06 | 1 | -2/+2 |
| * | | | | | | | | | doc: improve formatting in githooks.txt | Andreas Heiduk | 2018-05-06 | 1 | -57/+58 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'nd/doc-header' | Junio C Hamano | 2018-05-23 | 38 | -96/+96 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | doc: keep first level section header in upper case | Nguyễn Thái Ngọc Duy | 2018-05-02 | 38 | -96/+96 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'js/rebase-recreate-merge' | Junio C Hamano | 2018-05-23 | 3 | -2/+175 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | rebase -i --rebase-merges: add a section to the man page | Johannes Schindelin | 2018-04-26 | 1 | -0/+135 |
| * | | | | | | | | | rebase -i: introduce --rebase-merges=[no-]rebase-cousins | Johannes Schindelin | 2018-04-26 | 1 | -4/+11 |
| * | | | | | | | | | pull: accept --rebase=merges to recreate the branch topology | Johannes Schindelin | 2018-04-26 | 2 | -1/+13 |
| * | | | | | | | | | rebase: introduce the --rebase-merges option | Johannes Schindelin | 2018-04-26 | 1 | -1/+20 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'nd/pack-objects-pack-struct' | Junio C Hamano | 2018-05-23 | 3 | -3/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | pack-objects: shrink z_delta_size field in struct object_entry | Nguyễn Thái Ngọc Duy | 2018-04-16 | 1 | -1/+2 |
| * | | | | | | | | | pack-objects: use bitfield for object_entry::depth | Nguyễn Thái Ngọc Duy | 2018-04-16 | 3 | -2/+7 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'js/no-pager-shorthand' | Junio C Hamano | 2018-05-23 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git: add -P as a short option for --no-pager | Johannes Sixt | 2018-05-04 | 1 | -1/+2 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'tg/worktree-add-existing-branch' | Junio C Hamano | 2018-05-23 | 1 | -2/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | worktree: teach "add" to check out existing branches | Thomas Gummerer | 2018-04-30 | 1 | -2/+7 |