summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* convert: unify the "auto" handling of CRLFTorsten Bögershausen2016-07-062-13/+14
* convert: allow core.autocrlf=input and core.eol=crlfTorsten Bögershausen2016-04-251-3/+3
* Git 2.8v2.8.0Junio C Hamano2016-03-282-8/+13
* Merge branch 'ls/p4-doc-markup'Junio C Hamano2016-03-241-6/+4
|\
| * Documentation: fix git-p4 AsciiDoc formattingls/p4-doc-markupLars Schneider2016-03-231-5/+3
| * Documentation: use ASCII quotation marks in git-p4Lars Schneider2016-03-211-1/+1
* | Sync with maintJunio C Hamano2016-03-211-1/+1
|\ \
| * \ Merge branch 'mm/doc-hooks-linkgit-fix' into maintJunio C Hamano2016-03-211-1/+1
| |\ \ | | |/ | |/|
| | * Documentation: fix broken linkgit to git-configmm/doc-hooks-linkgit-fixMatthieu Moy2016-03-211-1/+1
* | | RelNotes: remove the mention of !reinclusionJunio C Hamano2016-03-181-5/+0
* | | Revert "Merge branch 'nd/exclusion-regression-fix'"Junio C Hamano2016-03-183-19/+4
* | | Revert "Merge branch 'jc/exclusion-doc'"Junio C Hamano2016-03-181-37/+1
* | | Sync with Git 2.7.4Junio C Hamano2016-03-175-3/+50
|\ \ \ | |/ /
| * | Git 2.7.4v2.7.4Junio C Hamano2016-03-171-0/+11
| * | Sync with Git 2.6.6Junio C Hamano2016-03-174-3/+39
| |\ \
| | * | Git 2.6.6v2.6.6Junio C Hamano2016-03-172-1/+13
| | * | Merge branch 'maint-2.5' into maint-2.6Junio C Hamano2016-03-173-2/+26
| | |\ \
| | | * | Git 2.5.5v2.5.5Junio C Hamano2016-03-172-1/+13
| | | * | Merge branch 'maint-2.4' into maint-2.5Junio C Hamano2016-03-172-1/+13
| | | |\ \ | | | | |/
| | | | * Git 2.4.11v2.4.11Junio C Hamano2016-03-172-1/+13
* | | | | Git 2.8-rc3v2.8.0-rc3Junio C Hamano2016-03-161-0/+17
* | | | | Merge branch 'cn/deprecate-ssh-git-url'Junio C Hamano2016-03-161-1/+1
|\ \ \ \ \
| * | | | | Disown ssh+git and git+sshcn/deprecate-ssh-git-urlCarlos Martín Nieto2016-03-091-1/+1
* | | | | | RelNotes for 2.8.0: typofixJunio C Hamano2016-03-151-14/+10
* | | | | | git-svn: loosen config globs limitationsVictor Leschuk2016-03-151-0/+12
* | | | | | Git 2.8-rc2v2.8.0-rc2Junio C Hamano2016-03-101-4/+5
* | | | | | Sync with 2.7.3Junio C Hamano2016-03-102-1/+64
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Git 2.7.3v2.7.3Junio C Hamano2016-03-102-1/+64
| * | | | | Merge branch 'mm/push-simple-doc' into maintJunio C Hamano2016-03-101-0/+7
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/tighten-alloc' into maintJunio C Hamano2016-03-101-0/+7
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'jc/exclusion-doc'Junio C Hamano2016-03-101-1/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | gitignore: document that unignoring a directory unignores everything in itjc/exclusion-docJunio C Hamano2016-03-081-1/+37
* | | | | | | | | Merge branch 'sb/rebase-summary'Junio C Hamano2016-03-101-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: reword rebase summarysb/rebase-summaryStefan Beller2016-03-021-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Git 2.8-rc1v2.8.0-rc1Junio C Hamano2016-03-041-0/+12
* | | | | | | | | documentation: fix some typosThomas Ackermann2016-03-032-2/+2
* | | | | | | | | Git 2.8-rc0v2.8.0-rc0Junio C Hamano2016-02-261-0/+95
* | | | | | | | | Merge branch 'ls/makefile-cflags-developer-tweak'Junio C Hamano2016-02-261-0/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add DEVELOPER makefile knob to check for acknowledged warningsls/makefile-cflags-developer-tweakLars Schneider2016-02-251-0/+5
* | | | | | | | | | Merge branch 'fa/merge-recursive-no-rename'Junio C Hamano2016-02-261-2/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | merge-strategies.txt: fix typoFelipe Gonçalves Assis2016-02-221-2/+2
| * | | | | | | | | | merge-recursive: more consistent interfaceFelipe Gonçalves Assis2016-02-171-4/+6
| * | | | | | | | | | merge-recursive: option to disable renamesFelipe Gonçalves Assis2016-02-171-0/+6
* | | | | | | | | | | Merge branch 'mm/push-simple-doc'Junio C Hamano2016-02-261-0/+7
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Documentation/git-push: document that 'simple' is the defaultmm/push-simple-docMatthieu Moy2016-02-231-0/+7
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jg/credential-cache-chdir-to-sockdir'Junio C Hamano2016-02-261-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | credential-cache--daemon: disallow relative socket pathJon Griffiths2016-02-231-1/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ls/config-origin'Junio C Hamano2016-02-261-5/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | config: add '--show-origin' option to print the origin of a config valuels/config-originLars Schneider2016-02-221-5/+11
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/tighten-alloc'Junio C Hamano2016-02-261-0/+7
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |