summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Git 2.5.0-rc2v2.5.0-rc2Junio C Hamano2015-07-131-2/+44
* Merge branch 'es/worktree-add'Junio C Hamano2015-07-132-79/+134
|\
| * Revert "checkout: retire --ignore-other-worktrees in favor of --force"Junio C Hamano2015-07-121-3/+6
| * checkout: retire --ignore-other-worktrees in favor of --forceEric Sunshine2015-07-071-6/+3
| * worktree: add: auto-vivify new branch when <branch> is omittedEric Sunshine2015-07-071-2/+6
| * worktree: add: make -b/-B default to HEAD when <branch> is omittedEric Sunshine2015-07-061-0/+1
| * checkout: retire --to optionEric Sunshine2015-07-061-7/+0
| * worktree: add -b/-B optionsEric Sunshine2015-07-061-3/+10
| * worktree: add --detach optionEric Sunshine2015-07-061-1/+5
| * worktree: add --force optionEric Sunshine2015-07-061-1/+7
| * worktree: introduce "add" commandEric Sunshine2015-07-061-10/+10
| * Documentation/git-worktree: add EXAMPLES sectionEric Sunshine2015-07-061-0/+22
| * Documentation/git-worktree: add high-level 'lock' overviewEric Sunshine2015-07-061-9/+15
| * Documentation/git-worktree: split technical info from general descriptionEric Sunshine2015-07-061-34/+36
| * Documentation/git-worktree: add BUGS sectionEric Sunshine2015-07-061-3/+16
| * Documentation: move linked worktree description from checkout to worktreeEric Sunshine2015-07-062-67/+64
| * Documentation/git-worktree: associate options with commandsEric Sunshine2015-07-061-3/+3
| * Documentation/git-checkout: fix incorrect worktree prune commandEric Sunshine2015-07-061-1/+1
* | Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-07-132-3/+48
|\ \ | |/
| * worktree: new place for "git prune --worktrees"nd/multiple-work-treesNguyễn Thái Ngọc Duy2015-06-292-3/+48
* | Merge branch 'kb/use-nsec-doc'Junio C Hamano2015-07-131-2/+6
|\ \
| * | Makefile / racy-git.txt: clarify USE_NSEC prerequisiteskb/use-nsec-docKarsten Blees2015-07-011-2/+6
* | | The last minute bits of fixesJunio C Hamano2015-07-101-0/+21
* | | Merge branch 'mm/branch-doc-updates'Junio C Hamano2015-07-101-2/+6
|\ \ \
| * | | Documentation/branch: document -M and -D in terms of --forcemm/branch-doc-updatesMatthieu Moy2015-07-061-2/+2
| * | | Documentation/branch: document -d --force and -m --forceMatthieu Moy2015-07-061-0/+4
* | | | Merge branch 'ls/hint-rev-list-count'Junio C Hamano2015-07-101-0/+1
|\ \ \ \
| * | | | rev-list: add --count to usage guidels/hint-rev-list-countLawrence Siebert2015-07-011-0/+1
* | | | | Merge branch 'tb/checkout-doc'Junio C Hamano2015-07-101-1/+5
|\ \ \ \ \
| * | | | | git-checkout.txt: document "git checkout <pathspec>" bettertb/checkout-docTorsten Bögershausen2015-06-171-1/+5
* | | | | | Merge branch 'jk/pretty-encoding-doc'Junio C Hamano2015-07-101-1/+4
|\ \ \ \ \ \
| * | | | | | docs: clarify that --encoding can produce invalid sequencesjk/pretty-encoding-docJeff King2015-06-171-1/+4
* | | | | | | Git 2.5.0-rc1v2.5.0-rc1Junio C Hamano2015-07-011-0/+7
* | | | | | | Merge branch 'mm/describe-doc'Junio C Hamano2015-07-011-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Documentation/describe: improve one-line summarymm/describe-docMatthieu Moy2015-06-161-1/+1
* | | | | | | | Git 2.5.0-rc0v2.5.0-rc0Junio C Hamano2015-06-251-15/+2
* | | | | | | | Sync with 2.4.5Junio C Hamano2015-06-252-1/+30
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Git 2.4.5v2.4.5Junio C Hamano2015-06-252-1/+30
| * | | | | | | Merge branch 'sg/merge-summary-config' into maintJunio C Hamano2015-06-253-16/+12
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'sb/pack-protocol-mention-smart-http' into maintJunio C Hamano2015-06-251-3/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/color-diff-plain-is-context' into maintJunio C Hamano2015-06-251-1/+2
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Ninth batch for 2.5Junio C Hamano2015-06-241-39/+102
* | | | | | | | | | Merge branch 'fk/doc-format-patch-vn'Junio C Hamano2015-06-241-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | doc: format-patch: fix typofk/doc-format-patch-vnFrans Klaver2015-06-101-1/+1
* | | | | | | | | | | Merge branch 'rl/am-3way-config'Junio C Hamano2015-06-242-2/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-am: add am.threeWay config variablerl/am-3way-configRemi Lespinet2015-06-042-2/+13
* | | | | | | | | | | | Merge branch 'jc/ll-merge-expose-path'Junio C Hamano2015-06-241-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ll-merge: pass the original path to external driversjc/ll-merge-expose-pathJunio C Hamano2015-06-041-1/+4
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'pt/pull-optparse'Junio C Hamano2015-06-241-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pull: handle git-fetch's options as wellPaul Tan2015-06-021-3/+0