summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* dir: remove unused variable sbrs/janitorialRené Scharfe2015-05-201-2/+0
* clean: remove unused variable bufRené Scharfe2015-05-201-2/+0
* use file_exists() to check if a file exists in the worktreeRené Scharfe2015-05-205-22/+9
* Git 2.4.1v2.4.1Junio C Hamano2015-05-134-3/+44
* Merge branch 'sb/line-log-plug-pairdiff-leak' into maintJunio C Hamano2015-05-131-0/+1
|\
| * line-log.c: fix a memleaksb/line-log-plug-pairdiff-leakStefan Beller2015-03-301-0/+1
* | Merge branch 'sb/test-bitmap-free-at-end' into maintJunio C Hamano2015-05-131-0/+2
|\ \
| * | pack-bitmap.c: fix a memleakStefan Beller2015-04-121-0/+2
* | | Merge branch 'nd/t1509-chroot-test' into maintJunio C Hamano2015-05-131-9/+29
|\ \ \
| * | | t1509: update prepare script to be able to run t1509 in chroot againnd/t1509-chroot-testNguyễn Thái Ngọc Duy2015-04-181-9/+29
* | | | Merge branch 'jk/type-from-string-gently' into maintJunio C Hamano2015-05-132-1/+10
|\ \ \ \
| * | | | type_from_string_gently: make sure length matchesjk/type-from-string-gentlyJeff King2015-04-172-1/+10
* | | | | Merge branch 'ep/fix-test-lib-functions-report' into maintJunio C Hamano2015-05-131-2/+2
|\ \ \ \ \
| * | | | | test-lib-functions.sh: fix the second argument to some helper functionsep/fix-test-lib-functions-reportElia Pinto2015-04-161-2/+2
* | | | | | Merge branch 'cn/bom-in-gitignore' into maintJunio C Hamano2015-05-136-5/+39
|\ \ \ \ \ \
| * | | | | | attr: skip UTF8 BOM at the beginning of the input filecn/bom-in-gitignoreJunio C Hamano2015-04-161-2/+7
| * | | | | | config: use utf8_bom[] from utf.[ch] in git_parse_source()Junio C Hamano2015-04-161-3/+3
| * | | | | | utf8-bom: introduce skip_utf8_bom() helperJunio C Hamano2015-04-163-5/+18
| * | | | | | add_excludes_from_file: clarify the bom skipping logicJunio C Hamano2015-04-161-4/+5
| * | | | | | dir: allow a BOM at the beginning of exclude filesCarlos Martín Nieto2015-04-162-1/+16
* | | | | | | Merge branch 'jk/prune-mtime' into maintJunio C Hamano2015-05-133-9/+26
|\ \ \ \ \ \ \
| * | | | | | | sha1_file: only freshen packs once per runJeff King2015-04-202-1/+9
| * | | | | | | sha1_file: freshen pack objects before looseJeff King2015-04-201-1/+1
| * | | | | | | reachable: only mark local objects as recentJeff King2015-04-203-7/+16
* | | | | | | | Merge branch 'jk/init-core-worktree-at-root' into maintJunio C Hamano2015-05-131-3/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | init: don't set core.worktree when initializing /.gitjk/init-core-worktree-at-rootJeff King2015-04-021-3/+15
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Sync with 2.3.8Junio C Hamano2015-05-1112-25/+149
|\ \ \ \ \ \ \ \
| * | | | | | | | Git 2.3.8v2.3.8Junio C Hamano2015-05-114-3/+26
| * | | | | | | | Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3Junio C Hamano2015-05-116-15/+16
| |\ \ \ \ \ \ \ \
| | * | | | | | | | log -L: improve error message on malformed argumentmm/usage-log-l-can-take-regexMatthieu Moy2015-04-202-5/+5
| | * | | | | | | | Documentation: change -L:<regex> to -L:<funcname>Matthieu Moy2015-04-204-10/+11
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge branch 'jc/diff-no-index-d-f' into maint-2.3Junio C Hamano2015-05-112-2/+98
| |\ \ \ \ \ \ \ \
| | * | | | | | | | diff-no-index: align D/F handling with that of normal Gitjc/diff-no-index-d-fJunio C Hamano2015-03-262-2/+33
| | * | | | | | | | diff-no-index: DWIM "diff D F" into "diff D/F F"Junio C Hamano2015-03-252-0/+65
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'oh/fix-config-default-user-name-section' into maint-2.3Junio C Hamano2015-05-111-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | config: fix settings in default_user_config templateoh/fix-config-default-user-name-sectionOssi Herrala2015-04-171-2/+2
| * | | | | | | | | Merge branch 'jc/epochtime-wo-tz' into maint-2.3Junio C Hamano2015-05-111-5/+9
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | parse_date_basic(): let the system handle DST conversionjc/epochtime-wo-tzJunio C Hamano2015-04-151-2/+6
| | * | | | | | | | | parse_date_basic(): return early when given a bogus timestampJunio C Hamano2015-04-151-3/+3
| | | |/ / / / / / / | | |/| | | | | | |
* | | | | | | | | | Git 2.4v2.4.0Junio C Hamano2015-04-302-1/+6
* | | | | | | | | | Merge branch 'mh/multimail-renewal'Junio C Hamano2015-04-282-24/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update git-multimail to version 1.0.2mh/multimail-renewalMichael Haggerty2015-04-282-24/+25
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'mg/show-notes-doc'Junio C Hamano2015-04-281-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rev-list-options.txt: complete sentence about notes matchingmg/show-notes-docMichael J Gruber2015-04-171-2/+2
* | | | | | | | | | | Merge branch 'nd/versioncmp-prereleases'Junio C Hamano2015-04-281-4/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git tag: mention versionsort.prereleaseSuffix in manpagend/versioncmp-prereleasesMichael Haggerty2015-04-231-4/+7
* | | | | | | | | | | | Merge branch 'mg/status-v-v'Junio C Hamano2015-04-281-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | status: document the -v/--verbose optionmg/status-v-vMichael Haggerty2015-04-231-0/+8
* | | | | | | | | | | | | Sync with 2.3.7Junio C Hamano2015-04-272-1/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Git 2.3.7v2.3.7Junio C Hamano2015-04-274-3/+25