summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* hook: use correct logical variableks/prepare-commit-msg-sample-fixKaartic Sivaraam2017-08-141-1/+1
* hook: add a simple first exampleks/prepare-commit-msg-sampleKaartic Sivaraam2017-07-122-3/+9
* hook: add sign-off using "interpret-trailers"Kaartic Sivaraam2017-07-121-1/+5
* hook: name the positional variablesKaartic Sivaraam2017-07-121-3/+6
* hook: cleanup scriptKaartic Sivaraam2017-07-122-17/+10
* Fifteenth batch for 2.14Junio C Hamano2017-07-061-0/+24
* Merge branch 'ab/strbuf-addftime-tzname-boolify'Junio C Hamano2017-07-063-6/+6
|\
| * strbuf: change an always NULL/"" strbuf_addftime() param to boolab/strbuf-addftime-tzname-boolifyÆvar Arnfjörð Bjarmason2017-07-013-6/+6
| * strbuf.h comment: discuss strbuf_addftime() arguments in orderÆvar Arnfjörð Bjarmason2017-06-241-1/+1
* | Merge branch 'xz/send-email-batch-size'Junio C Hamano2017-07-064-0/+45
|\ \
| * | send-email: --batch-size to work around some SMTP server limitxiaoqiang zhao2017-07-054-0/+45
* | | Merge branch 'js/t5534-rev-parse-gives-multi-line-output-fix'Junio C Hamano2017-07-061-4/+10
|\ \ \
| * | | t5534: fix misleading grep invocationjs/t5534-rev-parse-gives-multi-line-output-fixJohannes Schindelin2017-07-051-4/+10
* | | | Merge branch 'sb/merge-recursive-code-cleanup'Junio C Hamano2017-07-061-3/+3
|\ \ \ \
| * | | | merge-recursive: use DIFF_XDL_SET macrosb/merge-recursive-code-cleanupStefan Beller2017-06-301-3/+3
* | | | | Merge branch 'rs/apply-avoid-over-reading'Junio C Hamano2017-07-061-2/+1
|\ \ \ \ \
| * | | | | apply: use starts_with() in gitdiff_verify_name()René Scharfe2017-07-011-2/+1
* | | | | | Merge branch 'ab/sha1dc-maint'Junio C Hamano2017-07-061-22/+66
|\ \ \ \ \ \
| * | | | | | sha1dc: update from upstreamab/sha1dc-maintÆvar Arnfjörð Bjarmason2017-07-031-22/+66
* | | | | | | Merge branch 'jc/utf8-fprintf'Junio C Hamano2017-07-061-3/+2
|\ \ \ \ \ \ \
| * | | | | | | submodule--helper: do not call utf8_fprintf() unnecessarilyjc/utf8-fprintfJunio C Hamano2017-06-281-3/+2
* | | | | | | | Merge branch 'js/fsck-name-object'Junio C Hamano2017-07-061-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | t1450: use egrep for regexp "alternation"js/fsck-name-objectJunio C Hamano2017-06-281-1/+1
* | | | | | | | | Merge branch 'aw/contrib-subtree-doc-asciidoctor'Junio C Hamano2017-07-061-7/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | subtree: honour USE_ASCIIDOCTOR when setaw/contrib-subtree-doc-asciidoctorA. Wilcox2017-06-271-7/+19
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Fourteenth batch for 2.14Junio C Hamano2017-07-051-0/+12
* | | | | | | | | Merge branch 'jt/unify-object-info'Junio C Hamano2017-07-055-217/+224
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sha1_file: refactor has_sha1_file_with_flagsjt/unify-object-infoJonathan Tan2017-06-264-23/+13
| * | | | | | | | | sha1_file: do not access pack if unneededJonathan Tan2017-06-261-0/+11
| * | | | | | | | | sha1_file: teach sha1_object_info_extended more flagsJonathan Tan2017-06-262-19/+28
| * | | | | | | | | sha1_file: refactor read_objectJonathan Tan2017-06-212-42/+43
| * | | | | | | | | sha1_file: move delta base cache code upJonathan Tan2017-06-211-110/+110
| * | | | | | | | | sha1_file: rename LOOKUP_REPLACE_OBJECTJonathan Tan2017-06-213-18/+18
| * | | | | | | | | sha1_file: rename LOOKUP_UNKNOWN_OBJECTJonathan Tan2017-06-213-4/+5
| * | | | | | | | | sha1_file: teach packed_object_info about typenameJonathan Tan2017-06-151-17/+12
* | | | | | | | | | Merge branch 'cc/shared-index-permfix'Junio C Hamano2017-07-054-11/+50
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t1700: make sure split-index respects core.sharedrepositorycc/shared-index-permfixChristian Couder2017-06-251-0/+30
| * | | | | | | | | | t1301: move modebits() to test-lib-functions.shChristian Couder2017-06-252-11/+12
| * | | | | | | | | | read-cache: use shared perms when writing shared indexChristian Couder2017-06-251-0/+8
* | | | | | | | | | | Merge branch 'rs/sha1-name-readdir-optim'Junio C Hamano2017-07-057-39/+90
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | sha1_file: guard against invalid loose subdirectory numbersrs/sha1-name-readdir-optimRené Scharfe2017-06-245-6/+9
| * | | | | | | | | | | sha1_file: let for_each_file_in_obj_subdir() handle subdir namesRené Scharfe2017-06-242-9/+14
| * | | | | | | | | | | p4205: add perf test script for pretty log formatsRené Scharfe2017-06-241-0/+16
| * | | | | | | | | | | sha1_name: cache readdir(3) results in find_short_object_filename()René Scharfe2017-06-223-26/+53
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'bw/repo-object'Junio C Hamano2017-07-0520-373/+972
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ls-files: use repository objectbw/repo-objectBrandon Williams2017-06-233-115/+118
| * | | | | | | | | | | repository: enable initialization of submodulesBrandon Williams2017-06-232-0/+64
| * | | | | | | | | | | submodule: convert is_submodule_initialized to work on a repositoryBrandon Williams2017-06-234-18/+16
| * | | | | | | | | | | submodule: add repo_read_gitmodulesBrandon Williams2017-06-232-0/+17
| * | | | | | | | | | | submodule-config: store the_submodule_cache in the_repositoryBrandon Williams2017-06-234-18/+72