Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | commit: add a commit.verbose config variablepb/commit-verbose-config | Pranit Bauva | 2016-05-10 | 2 | -1/+6 |
* | parse-options.c: make OPTION_COUNTUP respect "unspecified" values | Pranit Bauva | 2016-05-05 | 1 | -2/+6 |
* | Third batch for post 2.8 cycle | Junio C Hamano | 2016-04-08 | 1 | -0/+24 |
* | Merge branch 'oa/doc-diff-check' | Junio C Hamano | 2016-04-08 | 1 | -2/+2 |
|\ | |||||
| * | Documentation: git diff --check detects conflict markersoa/doc-diff-check | Ori Avtalion | 2016-03-29 | 1 | -2/+2 |
* | | Merge branch 'pb/opt-cmdmode-doc' | Junio C Hamano | 2016-04-08 | 1 | -0/+7 |
|\ \ | |||||
| * | | api-parse-options.txt: document OPT_CMDMODE()pb/opt-cmdmode-doc | Pranit Bauva | 2016-03-25 | 1 | -0/+7 |
| |/ | |||||
* | | Merge branch 'nd/apply-doc' | Junio C Hamano | 2016-04-08 | 1 | -1/+3 |
|\ \ | |||||
| * | | git-apply.txt: mention the behavior inside a subdirnd/apply-doc | Nguyễn Thái Ngọc Duy | 2016-03-24 | 1 | -0/+2 |
| * | | git-apply.txt: remove a space | Nguyễn Thái Ngọc Duy | 2016-03-24 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'jc/merge-refuse-new-root' | Junio C Hamano | 2016-04-08 | 1 | -0/+13 |
|\ \ | |||||
| * | | merge: refuse to create too cool a merge by default | Junio C Hamano | 2016-03-23 | 1 | -0/+13 |
* | | | Second batch for post 2.8 cycle | Junio C Hamano | 2016-04-06 | 1 | -1/+50 |
* | | | Merge branch 'la/tag-force-signing-annotated-tags' | Junio C Hamano | 2016-04-06 | 1 | -0/+5 |
|\ \ \ | |||||
| * | | | tag: add the option to force signing of annotated tagsla/tag-force-signing-annotated-tags | Laurent Arnoud | 2016-03-22 | 1 | -0/+5 |
* | | | | Merge branch 'sb/rebase-x' | Junio C Hamano | 2016-04-06 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | rebase: decouple --exec from --interactive | Stefan Beller | 2016-03-18 | 1 | -3/+3 |
* | | | | | Merge branch 'ls/p4-map-user' | Junio C Hamano | 2016-04-06 | 1 | -0/+11 |
|\ \ \ \ \ | |||||
| * | | | | | git-p4: map a P4 user to Git author name and email addressls/p4-map-user | Lars Schneider | 2016-03-15 | 1 | -0/+11 |
* | | | | | | Merge branch 'cc/doc-recommend-performance-trace-to-file' | Junio C Hamano | 2016-04-06 | 1 | -0/+43 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation: talk about pager in api-trace.txtcc/doc-recommend-performance-trace-to-file | Christian Couder | 2016-03-07 | 1 | -0/+43 |
* | | | | | | | Merge branch 'sb/submodule-parallel-update' | Junio C Hamano | 2016-04-06 | 3 | -2/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | clone: allow an explicit argument for parallel submodule clones | Stefan Beller | 2016-03-01 | 1 | -1/+5 |
| * | | | | | | | submodule update: expose parallelism to the user | Stefan Beller | 2016-03-01 | 1 | -1/+6 |
| * | | | | | | | fetching submodules: respect `submodule.fetchJobs` config option | Stefan Beller | 2016-03-01 | 1 | -0/+6 |
* | | | | | | | | First batch for post 2.8 cycle | Junio C Hamano | 2016-04-03 | 1 | -0/+84 |
* | | | | | | | | Sync with Git 2.8.1 | Junio C Hamano | 2016-04-03 | 2 | -1/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Git 2.8.1v2.8.1 | Junio C Hamano | 2016-04-03 | 2 | -1/+11 |
* | | | | | | | | | Merge branch 'gf/fetch-pack-direct-object-fetch' | Junio C Hamano | 2016-04-03 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fetch-pack: update the documentation for "<refs>..." argumentsgf/fetch-pack-direct-object-fetch | Gabriel Souza Franco | 2016-03-05 | 1 | -0/+4 |
* | | | | | | | | | | Merge branch 'jk/config-get-urlmatch' | Junio C Hamano | 2016-04-03 | 1 | -10/+9 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Documentation/git-config: fix --get-all descriptionjk/config-get-urlmatch | John Keeping | 2016-02-28 | 1 | -2/+1 |
| * | | | | | | | | | | Documentation/git-config: use bulleted list for exit codes | John Keeping | 2016-02-28 | 1 | -7/+7 |
| * | | | | | | | | | | config: fail if --get-urlmatch finds no value | John Keeping | 2016-02-28 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'jk/add-i-highlight' | Junio C Hamano | 2016-04-03 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | add--interactive: allow custom diff highlighting programsjk/add-i-highlight | Jeff King | 2016-02-28 | 1 | -0/+8 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jk/credential-clear-config' | Junio C Hamano | 2016-04-03 | 2 | -2/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | credential: let empty credential specs reset helper listjk/credential-clear-config | Jeff King | 2016-02-26 | 2 | -2/+8 |
* | | | | | | | | | | | | Merge branch 'mm/diff-renames-default' | Junio C Hamano | 2016-04-03 | 1 | -3/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | diff: activate diff.renames by defaultmm/diff-renames-default | Matthieu Moy | 2016-02-25 | 1 | -1/+1 |
| * | | | | | | | | | | | Documentation/diff-config: fix description of diff.renames | Matthieu Moy | 2016-02-25 | 1 | -3/+7 |
* | | | | | | | | | | | | Git 2.8v2.8.0 | Junio C Hamano | 2016-03-28 | 2 | -8/+13 |
* | | | | | | | | | | | | Merge branch 'ls/p4-doc-markup' | Junio C Hamano | 2016-03-24 | 1 | -6/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Documentation: fix git-p4 AsciiDoc formattingls/p4-doc-markup | Lars Schneider | 2016-03-23 | 1 | -5/+3 |
| * | | | | | | | | | | | Documentation: use ASCII quotation marks in git-p4 | Lars Schneider | 2016-03-21 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Sync with maint | Junio C Hamano | 2016-03-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'mm/doc-hooks-linkgit-fix' into maint | Junio C Hamano | 2016-03-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Documentation: fix broken linkgit to git-configmm/doc-hooks-linkgit-fix | Matthieu Moy | 2016-03-21 | 1 | -1/+1 |
* | | | | | | | | | | | RelNotes: remove the mention of !reinclusion | Junio C Hamano | 2016-03-18 | 1 | -5/+0 |
* | | | | | | | | | | | Revert "Merge branch 'nd/exclusion-regression-fix'" | Junio C Hamano | 2016-03-18 | 3 | -19/+4 |