Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | convert: unify the "auto" handling of CRLF | Torsten Bögershausen | 2016-07-06 | 2 | -13/+14 |
* | convert: allow core.autocrlf=input and core.eol=crlf | Torsten Bögershausen | 2016-04-25 | 1 | -3/+3 |
* | Git 2.8v2.8.0 | Junio C Hamano | 2016-03-28 | 2 | -8/+13 |
* | Merge branch 'ls/p4-doc-markup' | Junio C Hamano | 2016-03-24 | 1 | -6/+4 |
|\ | |||||
| * | Documentation: fix git-p4 AsciiDoc formattingls/p4-doc-markup | Lars Schneider | 2016-03-23 | 1 | -5/+3 |
| * | Documentation: use ASCII quotation marks in git-p4 | Lars Schneider | 2016-03-21 | 1 | -1/+1 |
* | | Sync with maint | Junio C Hamano | 2016-03-21 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge branch 'mm/doc-hooks-linkgit-fix' into maint | Junio C Hamano | 2016-03-21 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | |||||
| | * | Documentation: fix broken linkgit to git-configmm/doc-hooks-linkgit-fix | Matthieu Moy | 2016-03-21 | 1 | -1/+1 |
* | | | RelNotes: remove the mention of !reinclusion | Junio C Hamano | 2016-03-18 | 1 | -5/+0 |
* | | | Revert "Merge branch 'nd/exclusion-regression-fix'" | Junio C Hamano | 2016-03-18 | 3 | -19/+4 |
* | | | Revert "Merge branch 'jc/exclusion-doc'" | Junio C Hamano | 2016-03-18 | 1 | -37/+1 |
* | | | Sync with Git 2.7.4 | Junio C Hamano | 2016-03-17 | 5 | -3/+50 |
|\ \ \ | |/ / | |||||
| * | | Git 2.7.4v2.7.4 | Junio C Hamano | 2016-03-17 | 1 | -0/+11 |
| * | | Sync with Git 2.6.6 | Junio C Hamano | 2016-03-17 | 4 | -3/+39 |
| |\ \ | |||||
| | * | | Git 2.6.6v2.6.6 | Junio C Hamano | 2016-03-17 | 2 | -1/+13 |
| | * | | Merge branch 'maint-2.5' into maint-2.6 | Junio C Hamano | 2016-03-17 | 3 | -2/+26 |
| | |\ \ | |||||
| | | * | | Git 2.5.5v2.5.5 | Junio C Hamano | 2016-03-17 | 2 | -1/+13 |
| | | * | | Merge branch 'maint-2.4' into maint-2.5 | Junio C Hamano | 2016-03-17 | 2 | -1/+13 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Git 2.4.11v2.4.11 | Junio C Hamano | 2016-03-17 | 2 | -1/+13 |
* | | | | | Git 2.8-rc3v2.8.0-rc3 | Junio C Hamano | 2016-03-16 | 1 | -0/+17 |
* | | | | | Merge branch 'cn/deprecate-ssh-git-url' | Junio C Hamano | 2016-03-16 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Disown ssh+git and git+sshcn/deprecate-ssh-git-url | Carlos Martín Nieto | 2016-03-09 | 1 | -1/+1 |
* | | | | | | RelNotes for 2.8.0: typofix | Junio C Hamano | 2016-03-15 | 1 | -14/+10 |
* | | | | | | git-svn: loosen config globs limitations | Victor Leschuk | 2016-03-15 | 1 | -0/+12 |
* | | | | | | Git 2.8-rc2v2.8.0-rc2 | Junio C Hamano | 2016-03-10 | 1 | -4/+5 |
* | | | | | | Sync with 2.7.3 | Junio C Hamano | 2016-03-10 | 2 | -1/+64 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Git 2.7.3v2.7.3 | Junio C Hamano | 2016-03-10 | 2 | -1/+64 |
| * | | | | | Merge branch 'mm/push-simple-doc' into maint | Junio C Hamano | 2016-03-10 | 1 | -0/+7 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/tighten-alloc' into maint | Junio C Hamano | 2016-03-10 | 1 | -0/+7 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'jc/exclusion-doc' | Junio C Hamano | 2016-03-10 | 1 | -1/+37 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | gitignore: document that unignoring a directory unignores everything in itjc/exclusion-doc | Junio C Hamano | 2016-03-08 | 1 | -1/+37 |
* | | | | | | | | | Merge branch 'sb/rebase-summary' | Junio C Hamano | 2016-03-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Documentation: reword rebase summarysb/rebase-summary | Stefan Beller | 2016-03-02 | 1 | -1/+1 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Git 2.8-rc1v2.8.0-rc1 | Junio C Hamano | 2016-03-04 | 1 | -0/+12 |
* | | | | | | | | | documentation: fix some typos | Thomas Ackermann | 2016-03-03 | 2 | -2/+2 |
* | | | | | | | | | Git 2.8-rc0v2.8.0-rc0 | Junio C Hamano | 2016-02-26 | 1 | -0/+95 |
* | | | | | | | | | Merge branch 'ls/makefile-cflags-developer-tweak' | Junio C Hamano | 2016-02-26 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | add DEVELOPER makefile knob to check for acknowledged warningsls/makefile-cflags-developer-tweak | Lars Schneider | 2016-02-25 | 1 | -0/+5 |
* | | | | | | | | | | Merge branch 'fa/merge-recursive-no-rename' | Junio C Hamano | 2016-02-26 | 1 | -2/+10 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | merge-strategies.txt: fix typo | Felipe Gonçalves Assis | 2016-02-22 | 1 | -2/+2 |
| * | | | | | | | | | | merge-recursive: more consistent interface | Felipe Gonçalves Assis | 2016-02-17 | 1 | -4/+6 |
| * | | | | | | | | | | merge-recursive: option to disable renames | Felipe Gonçalves Assis | 2016-02-17 | 1 | -0/+6 |
* | | | | | | | | | | | Merge branch 'mm/push-simple-doc' | Junio C Hamano | 2016-02-26 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Documentation/git-push: document that 'simple' is the defaultmm/push-simple-doc | Matthieu Moy | 2016-02-23 | 1 | -0/+7 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jg/credential-cache-chdir-to-sockdir' | Junio C Hamano | 2016-02-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | credential-cache--daemon: disallow relative socket path | Jon Griffiths | 2016-02-23 | 1 | -1/+1 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'ls/config-origin' | Junio C Hamano | 2016-02-26 | 1 | -5/+11 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | config: add '--show-origin' option to print the origin of a config valuels/config-origin | Lars Schneider | 2016-02-22 | 1 | -5/+11 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jk/tighten-alloc' | Junio C Hamano | 2016-02-26 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | |