summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* git-worktree.txt: fix typo "to"/"two", and add command/worktree-lockBen North2016-11-131-1/+1
* worktree.c: find_worktree() search by path suffixNguyễn Thái Ngọc Duy2016-07-081-0/+5
* worktree: add "unlock" commandNguyễn Thái Ngọc Duy2016-07-081-0/+5
* worktree: add "lock" commandNguyễn Thái Ngọc Duy2016-07-081-6/+20
* git-worktree.txt: keep subcommand listing in alphabetical orderNguyễn Thái Ngọc Duy2016-05-241-5/+5
* Fifth batch for post 2.8 cycleJunio C Hamano2016-04-181-0/+12
* Merge branch 'maint'Junio C Hamano2016-04-141-0/+55
|\
| * Prepare for 2.8.2Junio C Hamano2016-04-141-0/+38
| * Merge branch 'gf/fetch-pack-direct-object-fetch' into maintJunio C Hamano2016-04-141-0/+4
| |\
| * \ Merge branch 'jk/config-get-urlmatch' into maintJunio C Hamano2016-04-141-10/+9
| |\ \
| * \ \ Merge branch 'oa/doc-diff-check' into maintJunio C Hamano2016-04-141-2/+2
| |\ \ \
| * \ \ \ Merge branch 'pb/opt-cmdmode-doc' into maintJunio C Hamano2016-04-141-0/+7
| |\ \ \ \
| * \ \ \ \ Merge branch 'nd/apply-doc' into maintJunio C Hamano2016-04-141-1/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'cc/doc-recommend-performance-trace-to-file' into maintJunio C Hamano2016-04-141-0/+43
| |\ \ \ \ \ \
| * | | | | | | Start preparing for 2.8.2Junio C Hamano2016-04-131-0/+17
* | | | | | | | Fourth batch for post 2.8 cycleJunio C Hamano2016-04-131-2/+65
* | | | | | | | Merge branch 'ep/trace-doc-sample-fix'Junio C Hamano2016-04-131-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | api-trace.txt: fix typoep/trace-doc-sample-fixElia Pinto2016-04-051-1/+1
* | | | | | | | | Merge branch 'lt/pretty-expand-tabs'Junio C Hamano2016-04-131-0/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pretty: allow tweaking tabwidth in --expand-tabsJunio C Hamano2016-03-301-3/+6
| * | | | | | | | | pretty: enable --expand-tabs by default for selected pretty formatsJunio C Hamano2016-03-301-0/+6
| * | | | | | | | | pretty: expand tabs in indented logs to make things line up properlyLinus Torvalds2016-03-301-0/+5
* | | | | | | | | | Merge branch 'mj/pull-rebase-autostash'Junio C Hamano2016-04-131-0/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pull --rebase: add --[no-]autostash flagMehul Jain2016-03-211-0/+9
* | | | | | | | | | | Merge branch 'es/format-patch-doc-hide-no-patch'Junio C Hamano2016-04-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-format-patch.txt: don't show -s as shorthand for multiple optionses/format-patch-doc-hide-no-patchEric Sunshine2016-04-041-1/+1
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'kn/for-each-tag-branch'Junio C Hamano2016-04-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | for-each-ref: fix description of '--contains' in manpagekn/for-each-tag-branchSZEDER Gábor2016-03-301-1/+1
* | | | | | | | | | | | Merge branch 'rz/worktree-no-checkout'Junio C Hamano2016-04-131-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | worktree: add: introduce --checkout optionrz/worktree-no-checkoutRay Zhang2016-03-291-1/+7
* | | | | | | | | | | | | Merge branch 'jk/check-repository-format'Junio C Hamano2016-04-131-7/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | config: drop git_config_earlyJeff King2016-03-111-7/+0
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |