aboutsummaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAge
* Merge branch 'hv/submodule-config'Junio C Hamano2015-08-31
|\
| * submodule: use new config API for worktree configurationsHeiko Voigt2015-08-19
| * submodule: implement a config API for lookup of .gitmodules valuesHeiko Voigt2015-08-19
* | Merge branch 'sg/config-name-only'Junio C Hamano2015-08-31
|\ \
| * | config: add '--name-only' option to list only variable namesSZEDER Gábor2015-08-10
* | | Sync with 2.5.1Junio C Hamano2015-08-28
|\ \ \
| * | | Git 2.5.1v2.5.1Junio C Hamano2015-08-28
* | | | Seventh batch for 2.6Junio C Hamano2015-08-28
* | | | Sixth batch for 2.6Junio C Hamano2015-08-26
* | | | Merge branch 'as/docfix-reflog-expire-unreachable'Junio C Hamano2015-08-26
|\ \ \ \
| * | | | Documentation/config: fix inconsistent label on gc.*.reflogExpireUnreachableAndreas Schwab2015-08-21
* | | | | Merge branch 'jv/send-email-selective-smtp-auth'Junio C Hamano2015-08-26
|\ \ \ \ \
| * | | | | send-email: provide whitelist of SMTP AUTH mechanismsJan Viktorin2015-08-17
* | | | | | Merge branch 'ep/http-configure-ssl-version'Junio C Hamano2015-08-26
|\ \ \ \ \ \
| * | | | | | http: add support for specifying the SSL versionElia Pinto2015-08-17
| |/ / / / /
* | | | | | Fifth batch for 2.6Junio C Hamano2015-08-25
* | | | | | Merge branch 'mh/tempfile'Junio C Hamano2015-08-25
|\ \ \ \ \ \
| * | | | | | lockfile: move documentation to lockfile.h and lockfile.cMichael Haggerty2015-08-10
* | | | | | | Merge branch 'dt/refs-pseudo'Junio C Hamano2015-08-25
|\ \ \ \ \ \ \
| * | | | | | | refs: introduce pseudoref and per-worktree ref conceptsDavid Turner2015-07-31
* | | | | | | | Sync with maintJunio C Hamano2015-08-19
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Start preparing for 2.5.1Junio C Hamano2015-08-19
| * | | | | | | Merge branch 'ta/docfix-index-format-tech' into maintJunio C Hamano2015-08-19
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'kn/tag-doc-fix' into maintJunio C Hamano2015-08-19
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'es/doc-clean-outdated-tools' into maintJunio C Hamano2015-08-19
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ib/scripted-parse-opt-better-hint-string' into maintJunio C Hamano2015-08-19
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'se/doc-checkout-ours-theirs' into maintJunio C Hamano2015-08-19
| |\ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | Fourth batch for 2.6Junio C Hamano2015-08-19
* | | | | | | | | | | | | Merge branch 'jk/negative-hiderefs'Junio C Hamano2015-08-19
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | refs: support negative transfer.hideRefsJeff King2015-08-07
| * | | | | | | | | | | | | docs/config.txt: reorder hideRefs configJeff King2015-07-28
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Third batch for 2.6Junio C Hamano2015-08-17
* | | | | | | | | | | | | Merge branch 'ta/docfix-index-format-tech'Junio C Hamano2015-08-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | typofix for index-format.txtThomas Ackermann2015-07-28
* | | | | | | | | | | | | Second batch for 2.6Junio C Hamano2015-08-12
* | | | | | | | | | | | | Merge branch 'es/worktree-add-cleanup'Junio C Hamano2015-08-12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Documentation/git-worktree: fix duplicated 'from'Patrick Steinhardt2015-08-05
| * | | | | | | | | | | | | Documentation/config: mention "now" and "never" for 'expire' settingsEric Sunshine2015-07-28
| * | | | | | | | | | | | | Documentation/git-worktree: fix broken 'linkgit' invocationEric Sunshine2015-07-24
| * | | | | | | | | | | | | worktree: add: suppress auto-vivication with --detach and no <branch>Eric Sunshine2015-07-20
* | | | | | | | | | | | | | Merge branch 'pt/am-builtin'Junio C Hamano2015-08-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-am: add am.threeWay config variableRemi Lespinet2015-08-04
* | | | | | | | | | | | | | | Merge branch 'es/worktree-add'Junio C Hamano2015-08-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | config: rename "gc.pruneWorktreesExpire" to "gc.worktreePruneExpire"Eric Sunshine2015-07-20
| * | | | | | | | | | | | | | Documentation/git-worktree: wordsmith worktree-related manpagesMichael Haggerty2015-07-20
| * | | | | | | | | | | | | | Documentation/config: fix stale "git prune --worktree" referenceMichael Haggerty2015-07-20
| * | | | | | | | | | | | | | Documentation/git-worktree: fix incorrect reference to file "locked"Michael Haggerty2015-07-20
| * | | | | | | | | | | | | | Documentation/git-worktree: consistently use term "linked working tree"Michael Haggerty2015-07-20
* | | | | | | | | | | | | | | Merge branch 'ad/bisect-cleanup'Junio C Hamano2015-08-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Documentation/bisect: revise overall contentMichael Haggerty2015-06-26