summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* refs.c: remove lock_fd from struct ref_locksb/ref-lock-lose-lock-fdStefan Beller2015-05-101-10/+5
* First batch for 2.5 cycleJunio C Hamano2015-05-053-2/+88
* Merge branch 'jk/prune-mtime'Junio C Hamano2015-05-053-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 'mm/usage-log-l-can-take-regex'Junio C Hamano2015-05-056-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 'ep/fix-test-lib-functions-report'Junio C Hamano2015-05-051-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'Junio C Hamano2015-05-056-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 'jc/epochtime-wo-tz'Junio C Hamano2015-05-051-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
* | | | | | Merge branch 'nd/t1509-chroot-test'Junio C Hamano2015-05-051-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 'oh/fix-config-default-user-name-section'Junio C Hamano2015-05-051-2/+2
|\ \ \ \ \ \
| * | | | | | config: fix settings in default_user_config templateoh/fix-config-default-user-name-sectionOssi Herrala2015-04-171-2/+2
* | | | | | | Merge branch 'jk/type-from-string-gently'Junio C Hamano2015-05-052-1/+10
|\ \ \ \ \ \ \
| * | | | | | | type_from_string_gently: make sure length matchesjk/type-from-string-gentlyJeff King2015-04-172-1/+10
* | | | | | | | Merge branch 'sb/test-bitmap-free-at-end'Junio C Hamano2015-05-051-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | pack-bitmap.c: fix a memleakStefan Beller2015-04-121-0/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'ld/p4-filetype-detection'Junio C Hamano2015-05-052-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | git-p4: fix filetype detection on files opened exclusivelyld/p4-filetype-detectionBlair Holloway2015-04-042-3/+3
| * | | | | | | | git-p4: small fix for locked-file-move-testLuke Diamand2015-04-041-2/+2
| * | | | | | | | git-p4: fix small bug in locked test scriptsLuke Diamand2015-04-041-1/+1
* | | | | | | | | Merge branch 'ts/checkout-advice-plural'Junio C Hamano2015-05-051-2/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | checkout: call a single commit "it" intead of "them"ts/checkout-advice-pluralThomas Schneider2015-04-021-2/+9
* | | | | | | | | | Merge branch 'jk/init-core-worktree-at-root'Junio C Hamano2015-05-051-3/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | init: don't set core.worktree when initializing /.gitjk/init-core-worktree-at-rootJeff King2015-04-021-3/+15
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'mh/show-branch-topic'Junio C Hamano2015-05-051-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | show-branch: show all local heads when only giving one rev along --topicsmh/show-branch-topicMike Hommey2015-03-311-3/+3
* | | | | | | | | | | Merge branch 'sb/line-log-plug-pairdiff-leak'Junio C Hamano2015-05-051-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | line-log.c: fix a memleaksb/line-log-plug-pairdiff-leakStefan Beller2015-03-301-0/+1
* | | | | | | | | | | | Merge branch 'jc/diff-no-index-d-f'Junio C Hamano2015-05-052-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 'bc/object-id'Junio C Hamano2015-05-0518-145/+192
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | apply: convert threeway_stage to object_idbrian m. carlson2015-03-131-7/+7
| * | | | | | | | | | | | patch-id: convert to use struct object_idbrian m. carlson2015-03-131-17/+17
| * | | | | | | | | | | | commit: convert parts to struct object_idbrian m. carlson2015-03-136-35/+39
| * | | | | | | | | | | | diff: convert struct combine_diff_path to object_idbrian m. carlson2015-03-134-40/+41
| * | | | | | | | | | | | bulk-checkin.c: convert to use struct object_idbrian m. carlson2015-03-131-6/+6
| * | | | | | | | | | | | zip: use GIT_SHA1_HEXSZ for trailersbrian m. carlson2015-03-131-2/+2