summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* mergetools: support TortoiseGitMergeSven Strickroth2013-01-271-1/+10
* Git 1.8.1v1.8.1Junio C Hamano2012-12-313-16/+21
* Merge branch 'so/prompt-command'Junio C Hamano2012-12-281-12/+20
|\
| * make __git_ps1 accept a third parameter in pcmodeSimon Oosthoek2012-12-261-12/+20
* | Sync with 1.8.0.3Junio C Hamano2012-12-282-1/+16
|\ \
| * | Git 1.8.0.3v1.8.0.3Junio C Hamano2012-12-284-3/+18
| * | git(1): show link to contributor summary pageJunio C Hamano2012-12-281-1/+4
| * | Merge branch 'sl/maint-git-svn-docs' into maintJunio C Hamano2012-12-281-6/+85
| |\ \
| | * | git-svn: Note about tags.Sebastian Leske2012-12-281-0/+6
| | * | git-svn: Expand documentation for --follow-parentSebastian Leske2012-12-281-3/+12
| | * | git-svn: Recommend use of structure options.Sebastian Leske2012-12-281-3/+21
| | * | git-svn: Document branches with at-sign(@).Sebastian Leske2012-12-281-0/+46
| * | | Merge branch 'gb/maint-doc-svn-log-window-size' into maintJunio C Hamano2012-12-281-0/+7
| |\ \ \
| * \ \ \ Merge branch 'km/maint-doc-git-reset' into maintJunio C Hamano2012-12-281-4/+4
| |\ \ \ \
| * | | | | git-remote-helpers.txt: document invocation before input formatMax Horn2012-12-281-31/+31
| * | | | | Merge branch 'jk/avoid-mailto-invalid-in-doc' into maintJunio C Hamano2012-12-283-3/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'tj/maint-doc-commit-sign' into maintJunio C Hamano2012-12-281-1/+5
| |\ \ \ \ \ \
| * | | | | | | Documentation: move diff.wordRegex from config.txt to diff-config.txtRamkumar Ramachandra2012-12-282-6/+6
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'maint'Junio C Hamano2012-12-231-1/+1
|\| | | | | |
| * | | | | | Merge branch 'jc/doc-diff-blobs' into maintJunio C Hamano2012-12-231-2/+7
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'cr/doc-checkout-branch' into maintJunio C Hamano2012-12-231-10/+41
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ta/api-index-doc' into maintJunio C Hamano2012-12-231-2/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'as/doc-for-devs' into maintJunio C Hamano2012-12-232-13/+16
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'sl/readme-gplv2' into maintJunio C Hamano2012-12-231-3/+4
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/fetch-tags-doc' into maintJunio C Hamano2012-12-231-8/+5
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/index-format-doc' into maintJunio C Hamano2012-12-231-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/mailmap-cleanup' into maintJunio C Hamano2012-12-232-33/+82
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ta/doc-cleanup' into maintJunio C Hamano2012-12-2320-68/+134
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Sort howto documents in howto-index.txtThomas Ackermann2012-12-231-1/+1
* | | | | | | | | | | | | | | | Git 1.8.1-rc3v1.8.1-rc3Junio C Hamano2012-12-221-1/+1
* | | | | | | | | | | | | | | | Merge branch 'ta/new-command-howto'Junio C Hamano2012-12-222-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Move ./technical/api-command.txt to ./howto/new-command.txtThomas Ackermann2012-12-212-2/+8
* | | | | | | | | | | | | | | | | Merge branch 'jc/doc-diff-blobs'Junio C Hamano2012-12-221-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Documentation: Describe "git diff <blob> <blob>" separatelyJunio C Hamano2012-12-181-2/+7
* | | | | | | | | | | | | | | | | Merge branch 'cr/doc-checkout-branch'Junio C Hamano2012-12-221-10/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Documentation/git-checkout.txt: document 70c9ac2 behaviorChris Rorvick2012-12-181-0/+8
| * | | | | | | | | | | | | | | | Documentation/git-checkout.txt: clarify usageChris Rorvick2012-12-181-10/+33
* | | | | | | | | | | | | | | | | Merge branch 'ta/api-index-doc'Junio C Hamano2012-12-221-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Remove misleading date from api-index-skel.txtThomas Ackermann2012-12-161-2/+0
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'jk/avoid-mailto-invalid-in-doc'Junio C Hamano2012-12-223-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Documentation: don't link to example mail addressesJohn Keeping2012-12-173-3/+3
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'as/doc-for-devs'Junio C Hamano2012-12-222-13/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Documentation: move support for old compilers to CodingGuidelinesAdam Spiers2012-12-172-13/+8
| * | | | | | | | | | | | | | SubmittingPatches: add convention of prefixing commit messagesAdam Spiers2012-12-171-0/+8
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'sl/readme-gplv2'Junio C Hamano2012-12-221-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | README: it does not matter who the current maintainer isJunio C Hamano2012-12-161-3/+2
| * | | | | | | | | | | | | README: Git is released under the GPLv2, not just "the GPL"Stefano Lattarini2012-12-161-1/+3
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'jc/fetch-tags-doc'Junio C Hamano2012-12-221-8/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | fetch --tags: clarify documentationJunio C Hamano2012-12-141-8/+5
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'nd/index-format-doc'Junio C Hamano2012-12-221-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |