Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'pb/commit-verbose-config' | Junio C Hamano | 2016-05-23 | 3 | -3/+12 |
|\ | |||||
| * | commit: add a commit.verbose config variablepb/commit-verbose-config | Pranit Bauva | 2016-05-10 | 2 | -1/+6 |
| * | parse-options.c: make OPTION_COUNTUP respect "unspecified" values | Pranit Bauva | 2016-05-05 | 1 | -2/+6 |
* | | Merge branch 'xy/format-patch-base' | Junio C Hamano | 2016-05-23 | 2 | -0/+64 |
|\ \ | |||||
| * | | format-patch: introduce format.useAutoBase configuration | Xiaolong Ye | 2016-04-26 | 1 | -0/+4 |
| * | | format-patch: introduce --base=auto option | Xiaolong Ye | 2016-04-26 | 1 | -0/+6 |
| * | | format-patch: add '--base' option to record base tree info | Xiaolong Ye | 2016-04-26 | 1 | -0/+54 |
* | | | Merge branch 'tb/core-eol-fix' | Junio C Hamano | 2016-05-23 | 1 | -3/+3 |
|\ \ \ | |||||
| * | | | convert: allow core.autocrlf=input and core.eol=crlf | Torsten Bögershausen | 2016-04-25 | 1 | -3/+3 |
| |/ / | |||||
* | | | Sync with 2.8.3 | Junio C Hamano | 2016-05-18 | 2 | -3/+35 |
|\ \ \ | |||||
| * | | | Git 2.8.3v2.8.3 | Junio C Hamano | 2016-05-18 | 2 | -3/+35 |
| * | | | Merge branch 'ew/doc-split-pack-disables-bitmap' into HEAD | Junio C Hamano | 2016-05-18 | 3 | -8/+15 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'rn/glossary-typofix' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'sb/config-exit-status-list' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -3/+3 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'ls/travis-submitting-patches' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -17/+63 |
| |\ \ \ \ \ \ | |||||
* | | | | | | | | Thirteenth batch for 2.9 | Junio C Hamano | 2016-05-17 | 1 | -6/+78 |
* | | | | | | | | Merge branch 'kf/gpg-sig-verification-doc' | Junio C Hamano | 2016-05-17 | 2 | -4/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Documentation: clarify signature verificationkf/gpg-sig-verification-doc | Keller Fuchs | 2016-05-13 | 2 | -4/+7 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'js/windows-dotgit' | Junio C Hamano | 2016-05-17 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | mingw: introduce the 'core.hideDotFiles' setting | Johannes Schindelin | 2016-05-11 | 1 | -0/+6 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'va/mailinfo-doc-typofix' | Junio C Hamano | 2016-05-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Documentation/git-mailinfo: fix typova/mailinfo-doc-typofix | Vasco Almeida | 2016-05-11 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'jc/linkgit-fix' | Junio C Hamano | 2016-05-17 | 8 | -10/+10 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Documentation: fix linkgit referencesjc/linkgit-fix | Junio C Hamano | 2016-05-09 | 8 | -10/+10 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'bn/config-doc-tt-varnames' | Junio C Hamano | 2016-05-17 | 1 | -11/+11 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | config: consistently format $variables in monospaced fontbn/config-doc-tt-varnames | Brian Norris | 2016-05-05 | 1 | -11/+11 |
* | | | | | | | | | | Merge branch 'lp/typofixes' | Junio C Hamano | 2016-05-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | typofix: assorted typofixes in comments, documentation and messageslp/typofixes | Li Peng | 2016-05-06 | 1 | -1/+1 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'sb/submodule-deinit-all' | Junio C Hamano | 2016-05-17 | 1 | -6/+13 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | submodule deinit: require '--all' instead of '.' for all submodules | Stefan Beller | 2016-05-05 | 1 | -6/+13 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'jc/config-pathname-type' | Junio C Hamano | 2016-05-17 | 1 | -11/+19 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | config: describe 'pathname' value typejc/config-pathname-type | Junio C Hamano | 2016-05-04 | 1 | -11/+19 |
* | | | | | | | | | | Merge branch 'bn/http-cookiefile-config' | Junio C Hamano | 2016-05-17 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | http: expand http.cookieFile as a pathbn/http-cookiefile-config | Brian Norris | 2016-05-04 | 1 | -1/+2 |
| * | | | | | | | | | | Documentation: config: improve word ordering for http.cookieFile | Brian Norris | 2016-05-04 | 1 | -1/+1 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'ab/hooks' | Junio C Hamano | 2016-05-17 | 3 | -31/+66 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | hooks: allow customizing where the hook directory is | Ævar Arnfjörð Bjarmason | 2016-05-04 | 2 | -4/+25 |
| * | | | | | | | | | | githooks.txt: minor improvements to the grammar & phrasing | Ævar Arnfjörð Bjarmason | 2016-05-04 | 1 | -16/+16 |
| * | | | | | | | | | | githooks.txt: amend dangerous advice about 'update' hook ACL | Ævar Arnfjörð Bjarmason | 2016-05-04 | 1 | -3/+5 |
| * | | | | | | | | | | githooks.txt: improve the intro section | Ævar Arnfjörð Bjarmason | 2016-05-04 | 2 | -13/+25 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Twelfth batch for 2.9 | Junio C Hamano | 2016-05-13 | 1 | -0/+20 |
* | | | | | | | | | | Merge branch 'jc/commit-tree-ignore-commit-gpgsign' | Junio C Hamano | 2016-05-13 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | commit-tree: do not pay attention to commit.gpgsignjc/commit-tree-ignore-commit-gpgsign | Junio C Hamano | 2016-05-03 | 1 | -2/+2 |
* | | | | | | | | | | | Eleventh batch for 2.9 | Junio C Hamano | 2016-05-10 | 1 | -0/+21 |
* | | | | | | | | | | | Merge branch 'rn/glossary-typofix' | Junio C Hamano | 2016-05-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Documentation: fix typo 'In such these cases'rn/glossary-typofix | René Nyffenegger | 2016-05-02 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'ls/travis-submitting-patches' | Junio C Hamano | 2016-05-10 | 1 | -17/+63 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Documentation: add setup instructions for Travis CIls/travis-submitting-patches | Lars Schneider | 2016-05-02 | 1 | -17/+63 |
* | | | | | | | | | | | Merge branch 'ew/doc-split-pack-disables-bitmap' | Junio C Hamano | 2016-05-10 | 3 | -8/+15 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | pack-objects: warn on split packs disabling bitmapsew/doc-split-pack-disables-bitmap | Eric Wong | 2016-04-28 | 3 | -8/+15 |