summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* commit: add a commit.verbose config variablepb/commit-verbose-configPranit Bauva2016-05-102-1/+6
* parse-options.c: make OPTION_COUNTUP respect "unspecified" valuesPranit Bauva2016-05-051-2/+6
* Third batch for post 2.8 cycleJunio C Hamano2016-04-081-0/+24
* Merge branch 'oa/doc-diff-check'Junio C Hamano2016-04-081-2/+2
|\
| * Documentation: git diff --check detects conflict markersoa/doc-diff-checkOri Avtalion2016-03-291-2/+2
* | Merge branch 'pb/opt-cmdmode-doc'Junio C Hamano2016-04-081-0/+7
|\ \
| * | api-parse-options.txt: document OPT_CMDMODE()pb/opt-cmdmode-docPranit Bauva2016-03-251-0/+7
| |/
* | Merge branch 'nd/apply-doc'Junio C Hamano2016-04-081-1/+3
|\ \
| * | git-apply.txt: mention the behavior inside a subdirnd/apply-docNguyễn Thái Ngọc Duy2016-03-241-0/+2
| * | git-apply.txt: remove a spaceNguyễn Thái Ngọc Duy2016-03-241-1/+1
| |/
* | Merge branch 'jc/merge-refuse-new-root'Junio C Hamano2016-04-081-0/+13
|\ \
| * | merge: refuse to create too cool a merge by defaultJunio C Hamano2016-03-231-0/+13
* | | Second batch for post 2.8 cycleJunio C Hamano2016-04-061-1/+50
* | | Merge branch 'la/tag-force-signing-annotated-tags'Junio C Hamano2016-04-061-0/+5
|\ \ \
| * | | tag: add the option to force signing of annotated tagsla/tag-force-signing-annotated-tagsLaurent Arnoud2016-03-221-0/+5
* | | | Merge branch 'sb/rebase-x'Junio C Hamano2016-04-061-3/+3
|\ \ \ \
| * | | | rebase: decouple --exec from --interactiveStefan Beller2016-03-181-3/+3
* | | | | Merge branch 'ls/p4-map-user'Junio C Hamano2016-04-061-0/+11
|\ \ \ \ \
| * | | | | git-p4: map a P4 user to Git author name and email addressls/p4-map-userLars Schneider2016-03-151-0/+11
* | | | | | Merge branch 'cc/doc-recommend-performance-trace-to-file'Junio C Hamano2016-04-061-0/+43
|\ \ \ \ \ \
| * | | | | | Documentation: talk about pager in api-trace.txtcc/doc-recommend-performance-trace-to-fileChristian Couder2016-03-071-0/+43
* | | | | | | Merge branch 'sb/submodule-parallel-update'Junio C Hamano2016-04-063-2/+17
|\ \ \ \ \ \ \
| * | | | | | | clone: allow an explicit argument for parallel submodule clonesStefan Beller2016-03-011-1/+5
| * | | | | | | submodule update: expose parallelism to the userStefan Beller2016-03-011-1/+6
| * | | | | | | fetching submodules: respect `submodule.fetchJobs` config optionStefan Beller2016-03-011-0/+6
* | | | | | | | First batch for post 2.8 cycleJunio C Hamano2016-04-031-0/+84
* | | | | | | | Sync with Git 2.8.1Junio C Hamano2016-04-032-1/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Git 2.8.1v2.8.1Junio C Hamano2016-04-032-1/+11
* | | | | | | | | Merge branch 'gf/fetch-pack-direct-object-fetch'Junio C Hamano2016-04-031-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fetch-pack: update the documentation for "<refs>..." argumentsgf/fetch-pack-direct-object-fetchGabriel Souza Franco2016-03-051-0/+4
* | | | | | | | | | Merge branch 'jk/config-get-urlmatch'Junio C Hamano2016-04-031-10/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation/git-config: fix --get-all descriptionjk/config-get-urlmatchJohn Keeping2016-02-281-2/+1
| * | | | | | | | | | Documentation/git-config: use bulleted list for exit codesJohn Keeping2016-02-281-7/+7
| * | | | | | | | | | config: fail if --get-urlmatch finds no valueJohn Keeping2016-02-281-1/+1
* | | | | | | | | | | Merge branch 'jk/add-i-highlight'Junio C Hamano2016-04-031-0/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | add--interactive: allow custom diff highlighting programsjk/add-i-highlightJeff King2016-02-281-0/+8
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/credential-clear-config'Junio C Hamano2016-04-032-2/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | credential: let empty credential specs reset helper listjk/credential-clear-configJeff King2016-02-262-2/+8
* | | | | | | | | | | | Merge branch 'mm/diff-renames-default'Junio C Hamano2016-04-031-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | diff: activate diff.renames by defaultmm/diff-renames-defaultMatthieu Moy2016-02-251-1/+1
| * | | | | | | | | | | Documentation/diff-config: fix description of diff.renamesMatthieu Moy2016-02-251-3/+7
* | | | | | | | | | | | Git 2.8v2.8.0Junio C Hamano2016-03-282-8/+13
* | | | | | | | | | | | Merge branch 'ls/p4-doc-markup'Junio C Hamano2016-03-241-6/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Documentation: fix git-p4 AsciiDoc formattingls/p4-doc-markupLars Schneider2016-03-231-5/+3
| * | | | | | | | | | | Documentation: use ASCII quotation marks in git-p4Lars Schneider2016-03-211-1/+1
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Sync with maintJunio C Hamano2016-03-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Merge branch 'mm/doc-hooks-linkgit-fix' into maintJunio C Hamano2016-03-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Documentation: fix broken linkgit to git-configmm/doc-hooks-linkgit-fixMatthieu Moy2016-03-211-1/+1
* | | | | | | | | | | RelNotes: remove the mention of !reinclusionJunio C Hamano2016-03-181-5/+0
* | | | | | | | | | | Revert "Merge branch 'nd/exclusion-regression-fix'"Junio C Hamano2016-03-183-19/+4