summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/negative-hiderefs'Junio C Hamano2015-08-191-17/+20
|\
| * refs: support negative transfer.hideRefsjk/negative-hiderefsJeff King2015-08-071-0/+5
| * docs/config.txt: reorder hideRefs configJeff King2015-07-281-17/+15
* | Third batch for 2.6Junio C Hamano2015-08-171-0/+11
* | Merge branch 'ta/docfix-index-format-tech'Junio C Hamano2015-08-171-1/+1
|\ \
| * | typofix for index-format.txtta/docfix-index-format-techThomas Ackermann2015-07-281-1/+1
* | | Second batch for 2.6Junio C Hamano2015-08-121-0/+25
* | | Merge branch 'es/worktree-add-cleanup'Junio C Hamano2015-08-122-10/+16
|\ \ \
| * | | Documentation/git-worktree: fix duplicated 'from'Patrick Steinhardt2015-08-051-1/+1
| * | | Documentation/config: mention "now" and "never" for 'expire' settingsEric Sunshine2015-07-281-5/+11
| * | | Documentation/git-worktree: fix broken 'linkgit' invocationEric Sunshine2015-07-241-1/+1
| * | | worktree: add: suppress auto-vivication with --detach and no <branch>Eric Sunshine2015-07-201-3/+3
* | | | Merge branch 'pt/am-builtin'Junio C Hamano2015-08-122-2/+13
|\ \ \ \
| * | | | git-am: add am.threeWay config variableRemi Lespinet2015-08-042-2/+13
* | | | | Merge branch 'es/worktree-add'Junio C Hamano2015-08-123-37/+37
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | config: rename "gc.pruneWorktreesExpire" to "gc.worktreePruneExpire"Eric Sunshine2015-07-202-3/+2
| * | | | Documentation/git-worktree: wordsmith worktree-related manpagesMichael Haggerty2015-07-202-11/+12
| * | | | Documentation/config: fix stale "git prune --worktree" referenceMichael Haggerty2015-07-201-1/+1
| * | | | Documentation/git-worktree: fix incorrect reference to file "locked"Michael Haggerty2015-07-201-1/+1
| * | | | Documentation/git-worktree: consistently use term "linked working tree"Michael Haggerty2015-07-202-23/+23
* | | | | Merge branch 'ad/bisect-cleanup'Junio C Hamano2015-08-121-60/+73
|\ \ \ \ \
| * | | | | Documentation/bisect: revise overall contentMichael Haggerty2015-06-261-54/+68
| * | | | | Documentation/bisect: move getting help section to the endMatthieu Moy2015-06-261-6/+5
* | | | | | Sync with maintJunio C Hamano2015-08-032-2/+24
|\ \ \ \ \ \
| * \ \ \ \ \ Sync with 2.4.8Junio C Hamano2015-08-032-2/+24
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Git 2.4.8v2.4.8Junio C Hamano2015-08-032-1/+23
* | | | | | | First batch for 2.6Junio C Hamano2015-08-031-0/+154
* | | | | | | Merge branch 'es/doc-clean-outdated-tools'Junio C Hamano2015-08-032-117/+9
|\ \ \ \ \ \ \
| * | | | | | | Documentation/git-tools: retire manually-maintained listes/doc-clean-outdated-toolsEric Sunshine2015-07-281-81/+7
| * | | | | | | Documentation/git-tools: drop references to defunct toolsEric Sunshine2015-07-281-31/+0
| * | | | | | | Documentation/git-tools: fix item text formattingEric Sunshine2015-07-281-67/+67
| * | | | | | | Documentation/git-tools: improve discoverability of Git wikiEric Sunshine2015-07-281-6/+3
| * | | | | | | Documentation/git: drop outdated Cogito referenceEric Sunshine2015-07-251-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jk/refspec-parse-wildcard'Junio C Hamano2015-08-031-2/+2
|\ \ \ \ \ \ \
| * | | | | | | refs: loosen restriction on wildcard "*" refspecsjk/refspec-parse-wildcardJacob Keller2015-07-271-2/+2
* | | | | | | | Merge branch 'zb/userdiff-fountain'Junio C Hamano2015-08-031-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | userdiff: add support for Fountain documentszb/userdiff-fountainZoë Blade2015-07-231-0/+2
* | | | | | | | | Merge branch 'dt/refs-backend-preamble'Junio C Hamano2015-08-033-2/+12
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | update-ref and tag: add --create-reflog argDavid Turner2015-07-212-2/+8
| * | | | | | | | git-reflog: add exists commandDavid Turner2015-07-211-0/+4
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/date-mode-format'Junio C Hamano2015-08-031-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | introduce "format" date-modeJeff King2015-06-291-0/+5
| |/ / / / / / /
* | | | | | | | Merge branch 'se/doc-checkout-ours-theirs'Junio C Hamano2015-08-031-0/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | checkout: document subtlety around --ours/--theirsse/doc-checkout-ours-theirsSimon A. Eugster2015-07-121-0/+15
* | | | | | | | | Merge branch 'ib/scripted-parse-opt-better-hint-string'Junio C Hamano2015-08-031-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rev-parse --parseopt: allow [*=?!] in argument hintsib/scripted-parse-opt-better-hint-stringIlya Bobyr2015-07-151-2/+2
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'kn/tag-doc-fix'Junio C Hamano2015-08-031-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation/tag: remove double occurance of "<pattern>"kn/tag-doc-fixKarthik Nayak2015-07-101-1/+0
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mh/fast-import-get-mark'Junio C Hamano2015-08-031-6/+33
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fast-import: add a get-mark commandmh/fast-import-get-markMichael Haggerty2015-07-011-6/+33