Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2016-04-14 | 1 | -0/+55 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Prepare for 2.8.2 | Junio C Hamano | 2016-04-14 | 1 | -0/+38 | |
| * | | | | | | | | | | | | Merge branch 'gf/fetch-pack-direct-object-fetch' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/config-get-urlmatch' into maint | Junio C Hamano | 2016-04-14 | 1 | -10/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'oa/doc-diff-check' into maint | Junio C Hamano | 2016-04-14 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pb/opt-cmdmode-doc' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/apply-doc' into maint | Junio C Hamano | 2016-04-14 | 1 | -1/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cc/doc-recommend-performance-trace-to-file' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+43 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Start preparing for 2.8.2 | Junio C Hamano | 2016-04-13 | 1 | -0/+17 | |
* | | | | | | | | | | | | | | | | | | | Fourth batch for post 2.8 cycle | Junio C Hamano | 2016-04-13 | 1 | -2/+65 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'ep/trace-doc-sample-fix' | Junio C Hamano | 2016-04-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | api-trace.txt: fix typoep/trace-doc-sample-fix | Elia Pinto | 2016-04-05 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'lt/pretty-expand-tabs' | Junio C Hamano | 2016-04-13 | 1 | -0/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | pretty: allow tweaking tabwidth in --expand-tabs | Junio C Hamano | 2016-03-30 | 1 | -3/+6 | |
| * | | | | | | | | | | | | | | | | | | pretty: enable --expand-tabs by default for selected pretty formats | Junio C Hamano | 2016-03-30 | 1 | -0/+6 | |
| * | | | | | | | | | | | | | | | | | | pretty: expand tabs in indented logs to make things line up properly | Linus Torvalds | 2016-03-30 | 1 | -0/+5 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'mj/pull-rebase-autostash' | Junio C Hamano | 2016-04-13 | 1 | -0/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | pull --rebase: add --[no-]autostash flag | Mehul Jain | 2016-03-21 | 1 | -0/+9 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'es/format-patch-doc-hide-no-patch' | Junio C Hamano | 2016-04-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | git-format-patch.txt: don't show -s as shorthand for multiple optionses/format-patch-doc-hide-no-patch | Eric Sunshine | 2016-04-04 | 1 | -1/+1 | |
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'kn/for-each-tag-branch' | Junio C Hamano | 2016-04-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | for-each-ref: fix description of '--contains' in manpagekn/for-each-tag-branch | SZEDER Gábor | 2016-03-30 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'rz/worktree-no-checkout' | Junio C Hamano | 2016-04-13 | 1 | -1/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | worktree: add: introduce --checkout optionrz/worktree-no-checkout | Ray Zhang | 2016-03-29 | 1 | -1/+7 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/check-repository-format' | Junio C Hamano | 2016-04-13 | 1 | -7/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | config: drop git_config_early | Jeff King | 2016-03-11 | 1 | -7/+0 | |
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | 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 |