summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* notes: teach git-notes about notes.<name>.mergeStrategy optionjk/notes-merge-configJacob Keller2015-08-172-0/+12
* notes: add notes.mergeStrategy option to select default strategyJacob Keller2015-08-172-1/+19
* notes: document cat_sort_uniq rewriteModeJacob Keller2015-08-172-4/+5
* Git 2.5v2.5.0js/rev-stdin-with-crlfJunio C Hamano2015-07-271-0/+5
* Sync with 2.4.7Junio C Hamano2015-07-272-1/+55
|\
| * Git 2.4.7v2.4.7Junio C Hamano2015-07-272-1/+55
| * Merge branch 'jk/pretty-encoding-doc' into maintJunio C Hamano2015-07-271-1/+4
| |\
| * \ Merge branch 'tb/checkout-doc' into maintJunio C Hamano2015-07-271-1/+5
| |\ \
| * \ \ Merge branch 'ls/hint-rev-list-count' into maintJunio C Hamano2015-07-271-0/+1
| |\ \ \
| * \ \ \ Merge branch 'mm/branch-doc-updates' into maintJunio C Hamano2015-07-271-2/+6
| |\ \ \ \
* | | | | | RelNotes: am.threeWay does not exist (yet)Junio C Hamano2015-07-241-2/+0
* | | | | | Revert "git-am: add am.threeWay config variable"Junio C Hamano2015-07-242-13/+2
* | | | | | Merge branch 'tf/gitweb-typofix'Junio C Hamano2015-07-211-1/+1
|\ \ \ \ \ \
| * | | | | | gitweb: fix typo in man pagetf/gitweb-typofixTony Finch2015-03-191-1/+1
* | | | | | | Merge branch 'es/worktree-add'Junio C Hamano2015-07-172-5/+6
|\ \ \ \ \ \ \
| * | | | | | | Documentation/git: fix stale "MULTIPLE CHECKOUT MODE" referenceEric Sunshine2015-07-171-1/+1
| * | | | | | | worktree: caution that this is still experimentalJunio C Hamano2015-07-161-2/+3
| * | | | | | | Documentation/git-worktree: fix stale "git checkout --to" referencesEric Sunshine2015-07-161-2/+2
* | | | | | | | Sync with 2.4.6Junio C Hamano2015-07-152-1/+25
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Git 2.4.6v2.4.6Junio C Hamano2015-07-152-1/+25
| * | | | | | | Merge branch 'mm/describe-doc' into maintJunio C Hamano2015-07-151-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'fk/doc-format-patch-vn' into maintJunio C Hamano2015-07-151-1/+1
| |\ \ \ \ \ \ \ \
* | | | | | | | | | 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
| | |_|_|/ / / / / / | |/| | | | | | | |
View Lorry Controller Status