summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t7406: submodule.<name>.update command must not be run from .gitmodulessb/test-submodule-update-configStefan Beller2017-09-271-0/+8
* The ninth batch for 2.15Junio C Hamano2017-09-251-0/+67
* Merge branch 'ks/test-readme-phrasofix'Junio C Hamano2017-09-251-3/+3
|\
| * t/README: fix typo and grammatically improve a sentenceks/test-readme-phrasofixKaartic Sivaraam2017-09-191-3/+3
* | Merge branch 'ow/rev-parse-is-shallow-repo'Junio C Hamano2017-09-253-0/+23
|\ \
| * | rev-parse: rev-parse: add --is-shallow-repositoryow/rev-parse-is-shallow-repoØystein Walle2017-09-193-0/+23
| |/
* | Merge branch 'rj/test-ulimit-on-windows'Junio C Hamano2017-09-255-40/+42
|\ \
| * | t9010-*.sh: skip all tests if the PIPE prereq is missingrj/test-ulimit-on-windowsRamsay Jones2017-09-191-27/+28
| * | test-lib: use more compact expression in PIPE prerequisiteRamsay Jones2017-09-191-8/+2
| * | test-lib: don't use ulimit in test prerequisites on cygwinRamsay Jones2017-09-154-5/+12
* | | Merge branch 'jk/info-alternates-fix'Junio C Hamano2017-09-251-20/+11
|\ \ \
| * | | read_info_alternates: warn on non-trivial errorsJeff King2017-09-201-0/+1
| * | | Merge branch 'jk/info-alternates-fix-2.11' into jk/info-alternates-fixJunio C Hamano2017-09-201-20/+10
| |\ \ \ | | |_|/ | |/| |
| | * | read_info_alternates: read contents into strbufjk/info-alternates-fix-2.11Jeff King2017-09-201-20/+10
* | | | Merge branch 'mh/for-each-string-list-item-empty-fix'Junio C Hamano2017-09-251-2/+4
|\ \ \ \
| * | | | for_each_string_list_item: avoid undefined behavior for empty listmh/for-each-string-list-item-empty-fixMichael Haggerty2017-09-201-2/+4
| |/ / /
* | | | Merge branch 'tb/test-lint-echo-e'Junio C Hamano2017-09-251-1/+1
|\ \ \ \
| * | | | test-lint: echo -e (or -E) is not portabletb/test-lint-echo-eTorsten Bögershausen2017-09-211-1/+1
| |/ / /
* | | | Merge branch 'jk/revision-remove-cmdline-pathspec'Junio C Hamano2017-09-253-32/+18
|\ \ \ \
| * | | | pathspec doc: parse_pathspec does not maintain references to argsjk/revision-remove-cmdline-pathspecJonathan Nieder2017-09-212-4/+7
| * | | | revision: replace "struct cmdline_pathspec" with argv_arrayJeff King2017-09-211-28/+11
* | | | | Merge branch 'ls/travis-scriptify'Junio C Hamano2017-09-2510-81/+154
|\ \ \ \ \
| * | | | | travis-ci: fix "skip_branch_tip_with_tag()" string comparisonls/travis-scriptifyLars Schneider2017-09-221-1/+1
| * | | | | travis: dedent a few scripts that are indented overly deeplyJunio C Hamano2017-09-112-33/+36
| * | | | | travis-ci: skip a branch build if equal tag is presentLars Schneider2017-09-111-0/+23
| * | | | | travis-ci: move Travis CI code into dedicated scriptsLars Schneider2017-09-1110-81/+128
* | | | | | Merge branch 'aw/gc-lockfile-fscanf-fix'Junio C Hamano2017-09-251-1/+1
|\ \ \ \ \ \
| * | | | | | gc: call fscanf() with %<len>s, not %<len>c, when reading hostnameaw/gc-lockfile-fscanf-fixJunio C Hamano2017-09-171-1/+1
* | | | | | | Merge branch 'hv/mv-nested-submodules-test'Junio C Hamano2017-09-251-0/+25
|\ \ \ \ \ \ \
| * | | | | | | add test for bug in git-mv for recursive submoduleshv/mv-nested-submodules-testHeiko Voigt2017-09-171-0/+25
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'bw/git-clang-format'Junio C Hamano2017-09-252-0/+169
|\ \ \ \ \ \ \
| * | | | | | | Makefile: add style build ruleBrandon Williams2017-08-141-0/+4
| * | | | | | | clang-format: outline the git project's coding styleBrandon Williams2017-08-141-0/+165
* | | | | | | | Merge branch 'nm/imap-send-with-curl'Junio C Hamano2017-09-251-20/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | imap-send: use curl by default when possiblenm/imap-send-with-curlNicolas Morey-Chaisemartin2017-09-151-3/+3
| * | | | | | | | imap_send: setup_curl: retreive credentials if not set in config fileNicolas Morey-Chaisemartin2017-09-151-2/+17
| * | | | | | | | imap-send: add wrapper to get server credentials if neededNicolas Morey-Chaisemartin2017-09-151-14/+20
| * | | | | | | | imap-send: return with error if curl failedNicolas Morey-Chaisemartin2017-09-151-1/+1
* | | | | | | | | Merge branch 'ks/commit-do-not-touch-cut-line'Junio C Hamano2017-09-251-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit-template: change a message to be more intuitiveks/commit-do-not-touch-cut-lineKaartic Sivaraam2017-09-151-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'tg/refs-allowed-flags'Junio C Hamano2017-09-252-0/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | refs: strip out not allowed flags from ref_transaction_updatetg/refs-allowed-flagsThomas Gummerer2017-09-142-0/+10
| |/ / / / / / / /
* | | | | | | | | Merge branch 'rs/archive-excluded-directory'Junio C Hamano2017-09-254-21/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | archive: don't add empty directories to archivesrs/archive-excluded-directoryRené Scharfe2017-09-144-21/+6
* | | | | | | | | | Merge branch 'ks/help-alias-label'Junio C Hamano2017-09-251-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | help: change a message to be more preciseks/help-alias-labelKaartic Sivaraam2017-09-141-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jn/per-repo-object-store-fixes'Junio C Hamano2017-09-256-20/+45
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | replace-objects: evaluate replacement refs without using the object storejn/per-repo-object-store-fixesStefan Beller2017-09-141-1/+1
| * | | | | | | | | | push, fetch: error out for submodule entries not pointing to commitsStefan Beller2017-09-142-8/+35
| * | | | | | | | | | pack: make packed_git_mru global a value instead of a pointerJonathan Nieder2017-09-143-11/+9
| | |_|/ / / / / / / | |/| | | | | | | |