Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am/cherry-pick/rebase/revert: document --rerere-autoupdate | Phillip Wood | 2019-03-18 | 4 | -0/+20 |
* | The second batch | Junio C Hamano | 2019-03-11 | 1 | -0/+22 |
* | Merge branch 'js/rebase-recreate-merge' | Junio C Hamano | 2019-03-11 | 1 | -1/+1 |
|\ | |||||
| * | rebase docs: fix "gitlink" typo | Kyle Meyer | 2019-03-01 | 1 | -1/+1 |
* | | Merge branch 'rd/gc-prune-doc-fix' | Junio C Hamano | 2019-03-11 | 1 | -1/+1 |
|\ \ | |||||
| * | | docs/git-gc: fix typo "--prune=all" to "--prune=now" | Robert P. J. Day | 2019-03-03 | 1 | -1/+1 |
* | | | Merge branch 'yb/utf-16le-bom-spellfix' | Junio C Hamano | 2019-03-11 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | gitattributes.txt: fix typo | Yash Bhatambare | 2019-03-07 | 1 | -1/+1 |
* | | | | Start 2.22 cycle | Junio C Hamano | 2019-03-07 | 1 | -0/+79 |
* | | | | Merge branch 'rd/doc-hook-used-in-sample' | Junio C Hamano | 2019-03-07 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | mention use of "hooks.allownonascii" in "man githooks" | Robert P. J. Day | 2019-02-21 | 1 | -0/+4 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'nd/diff-parseopt-2' | Junio C Hamano | 2019-03-07 | 1 | -0/+20 |
|\ \ \ \ | |||||
| * | | | | diff-parseopt: convert --no-renames|--[no--rename-empty | Nguyễn Thái Ngọc Duy | 2019-02-21 | 1 | -0/+3 |
| * | | | | diff-parseopt: convert --output-* | Nguyễn Thái Ngọc Duy | 2019-02-21 | 1 | -0/+10 |
| * | | | | diff-parseopt: convert --dirstat and friends | Nguyễn Thái Ngọc Duy | 2019-02-21 | 1 | -0/+7 |
* | | | | | Merge branch 'en/merge-options-doc' | Junio C Hamano | 2019-03-07 | 1 | -3/+8 |
|\ \ \ \ \ | |||||
| * | | | | | merge-options.txt: correct wording of --no-commit option | Elijah Newren | 2019-02-21 | 1 | -3/+8 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'dl/doc-submodule-wo-subcommand' | Junio C Hamano | 2019-03-07 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | submodule: document default behavior | Denton Liu | 2019-02-15 | 1 | -0/+4 |
* | | | | | | Merge branch 'jh/trace2' | Junio C Hamano | 2019-03-07 | 1 | -0/+1349 |
|\ \ \ \ \ \ | |||||
| * | | | | | | trace2: Documentation/technical/api-trace2.txt | Jeff Hostetler | 2019-02-22 | 1 | -0/+1349 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'js/doc-symref-in-proto-v1' | Junio C Hamano | 2019-03-07 | 1 | -0/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | protocol-capabilities.txt: document symref | Josh Steadmon | 2019-02-21 | 1 | -0/+18 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'en/combined-all-paths' | Junio C Hamano | 2019-03-07 | 4 | -5/+46 |
|\ \ \ \ \ \ | |||||
| * | | | | | | log,diff-tree: add --combined-all-paths option | Elijah Newren | 2019-02-07 | 4 | -5/+46 |
* | | | | | | | Merge branch 'du/branch-show-current' | Junio C Hamano | 2019-03-07 | 1 | -1/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | branch: introduce --show-current display option | Daniels Umanovskis | 2018-10-26 | 1 | -1/+5 |
* | | | | | | | | Merge branch 'wh/author-committer-ident-config' | Junio C Hamano | 2019-03-07 | 1 | -8/+15 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | config: allow giving separate author and committer idents | William Hubbs | 2019-02-04 | 1 | -8/+15 |
* | | | | | | | | | Merge branch 'aw/pretty-trailers' | Junio C Hamano | 2019-03-07 | 1 | -112/+152 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | pretty: add support for separator option in %(trailers) | Anders Waldenborg | 2019-01-29 | 1 | -0/+9 |
| * | | | | | | | | | pretty: add support for "valueonly" option in %(trailers) | Anders Waldenborg | 2019-01-29 | 1 | -0/+2 |
| * | | | | | | | | | pretty: allow showing specific trailers | Anders Waldenborg | 2019-01-29 | 1 | -0/+8 |
| * | | | | | | | | | pretty: allow %(trailers) options with explicit value | Anders Waldenborg | 2019-01-29 | 1 | -4/+10 |
| * | | | | | | | | | doc: group pretty-format.txt placeholders descriptions | Anders Waldenborg | 2018-12-09 | 1 | -110/+125 |
* | | | | | | | | | | Merge branch 'nd/diff-parseopt' | Junio C Hamano | 2019-03-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | diff.c: convert -U|--unified | Nguyễn Thái Ngọc Duy | 2019-01-27 | 1 | -1/+1 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'tg/checkout-no-overlay' | Junio C Hamano | 2019-03-07 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | revert "checkout: introduce checkout.overlayMode config" | Thomas Gummerer | 2019-02-04 | 1 | -7/+0 |
| * | | | | | | | | | checkout: introduce checkout.overlayMode config | Thomas Gummerer | 2019-01-08 | 1 | -0/+7 |
| * | | | | | | | | | checkout: introduce --{,no-}overlay option | Thomas Gummerer | 2019-01-08 | 1 | -0/+10 |
* | | | | | | | | | | Merge branch 'yn/checkout-doc-fix' | Junio C Hamano | 2019-02-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
| * | | | | | | | | | checkout doc: fix an unmatched double-quote pair | Yoichi Nakayama | 2019-02-23 | 1 | -1/+1 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'ea/rebase-compat-doc-fix' | Junio C Hamano | 2019-02-14 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | docs/git-rebase: remove redundant entry in incompatible options list | Emilio Cobos Álvarez | 2019-02-14 | 1 | -1/+0 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'en/rebase-merge-on-sequencer' | Junio C Hamano | 2019-02-14 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-rebase.txt: update to reflect merge now implemented on sequencer | Elijah Newren | 2019-02-14 | 1 | -2/+0 |
* | | | | | | | | | | Git 2.21-rc1v2.21.0-rc1 | Junio C Hamano | 2019-02-13 | 1 | -0/+10 |
* | | | | | | | | | | RelNotes/2.21: misc typo/English fixups | Jeff King | 2019-02-12 | 1 | -5/+5 |
* | | | | | | | | | | RelNotes/2.21: tweak "--date=auto" mention | Jeff King | 2019-02-12 | 1 | -3/+3 |