summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t7510: do not fail when gpg warns about insecure memorymg/verify-commitKyle J. McKay2015-03-101-2/+2
* t7510: test verify-commitMichael J Gruber2014-06-231-1/+19
* t7510: exit for loop with test resultMichael J Gruber2014-06-231-2/+2
* verify-commit: scriptable commit signature verificationMichael J Gruber2014-06-236-0/+125
* gpg-interface: provide access to the payloadMichael J Gruber2014-06-233-0/+4
* gpg-interface: provide clear helper for struct signature_checkMichael J Gruber2014-06-234-6/+15
* Second batch for 2.1Junio C Hamano2014-06-061-0/+87
* Merge branch 'ss/howto-manage-trunk'Junio C Hamano2014-06-062-0/+217
|\
| * How to keep a project's canonical history correct.ss/howto-manage-trunkStephen P. Smith2014-05-282-0/+217
* | Merge branch 'mc/git-p4-prepare-p4-only'Junio C Hamano2014-06-062-24/+28
|\ \
| * | git-p4: Do not include diff in spec file when just preparing p4mc/git-p4-pre-are-p4-onlyMaxime Coste2014-05-272-24/+28
* | | Merge branch 'jn/test-lint-unmoor'Junio C Hamano2014-06-061-4/+4
|\ \ \
| * | | test-lint: find unportable sed, echo, test, and export usage after &&jn/test-lint-unmoorJonathan Nieder2014-05-231-4/+4
* | | | Merge branch 'ep/shell-assign-and-export-vars'Junio C Hamano2014-06-065-5/+16
|\ \ \ \
| * | | | scripts: more "export VAR=VALUE" fixesep/shell-assign-and-export-varsJunio C Hamano2014-05-232-2/+10
| * | | | scripts: "export VAR=VALUE" construct is not portableElia Pinto2014-05-233-3/+6
| |/ / /
* | | | Merge branch 'jj/command-line-adjective'Junio C Hamano2014-06-0619-47/+47
|\ \ \ \
| * | | | Documentation: use "command-line" when used as a compound adjective, and fix ...jj/command-line-somethingjj/command-line-adjectiveJason St. John2014-05-2119-47/+47
* | | | | Merge branch 'jc/coding-guidelines'Junio C Hamano2014-06-061-5/+145
|\ \ \ \ \
| * | | | | CodingGuidelines: avoid "test <cond> -a/-o <cond>"Junio C Hamano2014-05-201-0/+13
| * | | | | CodingGuidelines: on splitting a long lineJunio C Hamano2014-05-021-0/+55
| * | | | | CodingGuidelines: on comparisonJunio C Hamano2014-05-021-0/+27
| * | | | | CodingGuidelines: do not call the conditional statement "if()"Junio C Hamano2014-05-021-1/+1
| * | | | | CodingGuidelines: give an example for shell function preambleJunio C Hamano2014-05-021-3/+11
| * | | | | CodingGuidelines: give an example for control statementsJunio C Hamano2014-05-021-0/+11
| * | | | | CodingGuidelines: give an example for redirectionJunio C Hamano2014-05-021-0/+8
| * | | | | CodingGuidelines: give an example for case/esac statementJunio C Hamano2014-05-021-1/+11
| * | | | | CodingGuidelines: once it is in, it is not worth the code churnJunio C Hamano2014-05-021-0/+8
* | | | | | Merge branch 'nd/status-auto-comment-char'Junio C Hamano2014-06-067-4/+73
|\ \ \ \ \ \
| * | | | | | commit: allow core.commentChar=auto for character auto selectionnd/status-auto-comment-charNguyễn Thái Ngọc Duy2014-05-196-0/+66
| * | | | | | config: be strict on core.commentCharNguyễn Thái Ngọc Duy2014-05-192-4/+7
* | | | | | | Merge branch 'mt/rebase-i-keep-empty-test'Junio C Hamano2014-06-061-0/+8
|\ \ \ \ \ \ \
| * | | | | | | rebase --keep-empty -i: add testmt/rebase-i-keep-empty-testMichael S. Tsirkin2014-05-191-0/+8
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'mk/show-s-no-extra-blank-line-for-merges'Junio C Hamano2014-06-064-11/+15
|\ \ \ \ \ \ \
| * | | | | | | git-show: fix 'git show -s' to not add extra terminator after merge commitmk/show-s-no-extra-blank-line-for-mergesMax Kirillov2014-05-154-11/+15
| |/ / / / / /
* | | | | | | Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i'Junio C Hamano2014-06-061-0/+3
|\ \ \ \ \ \ \
| * | | | | | | git grep -O -i: if the pager is 'less', pass the '-I' optionsk/spawn-less-case-insensitively-from-grep-O-iJohannes Schindelin2014-05-151-0/+3
| |/ / / / / /
* | | | | | | Merge branch 'jd/subtree'Junio C Hamano2014-06-062-16/+25
|\ \ \ \ \ \ \
| * | | | | | | contrib/subtree: allow adding an annotated tagjd/subtreeJames Denholm2014-05-131-1/+2
| * | | | | | | contrib/subtree/Makefile: clean up rule for "clean"James Denholm2014-05-061-3/+4
| * | | | | | | contrib/subtree/Makefile: clean up rules to generate documentationJames Denholm2014-05-061-5/+8
| * | | | | | | contrib/subtree/Makefile: s/libexecdir/gitexecdir/James Denholm2014-05-061-3/+3
| * | | | | | | contrib/subtree/Makefile: use GIT-VERSION-FILEJames Denholm2014-05-061-3/+8
| * | | | | | | contrib/subtree/Makefile: scrap unused $(gitdir)James Denholm2014-05-061-1/+0
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'wk/doc-clarify-upstream'Junio C Hamano2014-06-061-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Documentation: mention config sources for @{upstream}wk/doc-clarify-upstreamW. Trevor King2014-05-131-1/+3
* | | | | | | | Merge branch 'tb/unicode-6.3-zero-width'Junio C Hamano2014-06-065-69/+334
|\ \ \ \ \ \ \ \
| * | | | | | | | utf8: make it easier to auto-update git_wcwidth()tb/unicode-6.3-zero-widthTorsten Bögershausen2014-05-125-59/+329
| * | | | | | | | utf8.c: use a table for double_widthTorsten Bögershausen2014-05-121-23/+18
* | | | | | | | | Merge branch 'jk/index-pack-report-missing'Junio C Hamano2014-06-061-2/+7
|\ \ \ \ \ \ \ \ \