Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ep/fix-test-lib-functions-report' | Junio C Hamano | 2015-05-05 | 1 | -2/+2 |
|\ | |||||
| * | test-lib-functions.sh: fix the second argument to some helper functionsep/fix-test-lib-functions-report | Elia Pinto | 2015-04-16 | 1 | -2/+2 |
* | | Merge branch 'cn/bom-in-gitignore' | Junio C Hamano | 2015-05-05 | 6 | -5/+39 |
|\ \ | |||||
| * | | attr: skip UTF8 BOM at the beginning of the input filecn/bom-in-gitignore | Junio C Hamano | 2015-04-16 | 1 | -2/+7 |
| * | | config: use utf8_bom[] from utf.[ch] in git_parse_source() | Junio C Hamano | 2015-04-16 | 1 | -3/+3 |
| * | | utf8-bom: introduce skip_utf8_bom() helper | Junio C Hamano | 2015-04-16 | 3 | -5/+18 |
| * | | add_excludes_from_file: clarify the bom skipping logic | Junio C Hamano | 2015-04-16 | 1 | -4/+5 |
| * | | dir: allow a BOM at the beginning of exclude files | Carlos Martín Nieto | 2015-04-16 | 2 | -1/+16 |
* | | | Merge branch 'jc/epochtime-wo-tz' | Junio C Hamano | 2015-05-05 | 1 | -5/+9 |
|\ \ \ | |||||
| * | | | parse_date_basic(): let the system handle DST conversionjc/epochtime-wo-tz | Junio C Hamano | 2015-04-15 | 1 | -2/+6 |
| * | | | parse_date_basic(): return early when given a bogus timestamp | Junio C Hamano | 2015-04-15 | 1 | -3/+3 |
* | | | | Merge branch 'nd/t1509-chroot-test' | Junio C Hamano | 2015-05-05 | 1 | -9/+29 |
|\ \ \ \ | |||||
| * | | | | t1509: update prepare script to be able to run t1509 in chroot againnd/t1509-chroot-test | Nguyễn Thái Ngọc Duy | 2015-04-18 | 1 | -9/+29 |
| |/ / / | |||||
* | | | | Merge branch 'oh/fix-config-default-user-name-section' | Junio C Hamano | 2015-05-05 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | config: fix settings in default_user_config templateoh/fix-config-default-user-name-section | Ossi Herrala | 2015-04-17 | 1 | -2/+2 |
* | | | | | Merge branch 'jk/type-from-string-gently' | Junio C Hamano | 2015-05-05 | 2 | -1/+10 |
|\ \ \ \ \ | |||||
| * | | | | | type_from_string_gently: make sure length matchesjk/type-from-string-gently | Jeff King | 2015-04-17 | 2 | -1/+10 |
* | | | | | | Merge branch 'sb/test-bitmap-free-at-end' | Junio C Hamano | 2015-05-05 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | pack-bitmap.c: fix a memleak | Stefan Beller | 2015-04-12 | 1 | -0/+2 |
* | | | | | | | Merge branch 'ld/p4-filetype-detection' | Junio C Hamano | 2015-05-05 | 2 | -6/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-p4: fix filetype detection on files opened exclusivelyld/p4-filetype-detection | Blair Holloway | 2015-04-04 | 2 | -3/+3 |
| * | | | | | | | git-p4: small fix for locked-file-move-test | Luke Diamand | 2015-04-04 | 1 | -2/+2 |
| * | | | | | | | git-p4: fix small bug in locked test scripts | Luke Diamand | 2015-04-04 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'ts/checkout-advice-plural' | Junio C Hamano | 2015-05-05 | 1 | -2/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | checkout: call a single commit "it" intead of "them"ts/checkout-advice-plural | Thomas Schneider | 2015-04-02 | 1 | -2/+9 |
* | | | | | | | | | Merge branch 'jk/init-core-worktree-at-root' | Junio C Hamano | 2015-05-05 | 1 | -3/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | init: don't set core.worktree when initializing /.gitjk/init-core-worktree-at-root | Jeff King | 2015-04-02 | 1 | -3/+15 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'mh/show-branch-topic' | Junio C Hamano | 2015-05-05 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | show-branch: show all local heads when only giving one rev along --topicsmh/show-branch-topic | Mike Hommey | 2015-03-31 | 1 | -3/+3 |
* | | | | | | | | | | Merge branch 'sb/line-log-plug-pairdiff-leak' | Junio C Hamano | 2015-05-05 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | line-log.c: fix a memleaksb/line-log-plug-pairdiff-leak | Stefan Beller | 2015-03-30 | 1 | -0/+1 |
* | | | | | | | | | | | Merge branch 'jc/diff-no-index-d-f' | Junio C Hamano | 2015-05-05 | 2 | -2/+98 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | diff-no-index: align D/F handling with that of normal Gitjc/diff-no-index-d-f | Junio C Hamano | 2015-03-26 | 2 | -2/+33 |
| * | | | | | | | | | | | diff-no-index: DWIM "diff D F" into "diff D/F F" | Junio C Hamano | 2015-03-25 | 2 | -0/+65 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2015-05-05 | 18 | -145/+192 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | apply: convert threeway_stage to object_id | brian m. carlson | 2015-03-13 | 1 | -7/+7 |
| * | | | | | | | | | | | patch-id: convert to use struct object_id | brian m. carlson | 2015-03-13 | 1 | -17/+17 |
| * | | | | | | | | | | | commit: convert parts to struct object_id | brian m. carlson | 2015-03-13 | 6 | -35/+39 |
| * | | | | | | | | | | | diff: convert struct combine_diff_path to object_id | brian m. carlson | 2015-03-13 | 4 | -40/+41 |
| * | | | | | | | | | | | bulk-checkin.c: convert to use struct object_id | brian m. carlson | 2015-03-13 | 1 | -6/+6 |
| * | | | | | | | | | | | zip: use GIT_SHA1_HEXSZ for trailers | brian m. carlson | 2015-03-13 | 1 | -2/+2 |
| * | | | | | | | | | | | archive.c: convert to use struct object_id | brian m. carlson | 2015-03-13 | 1 | -11/+11 |
| * | | | | | | | | | | | bisect.c: convert leaf functions to use struct object_id | brian m. carlson | 2015-03-13 | 1 | -20/+20 |
| * | | | | | | | | | | | define utility functions for object IDs | brian m. carlson | 2015-03-13 | 2 | -7/+41 |
| * | | | | | | | | | | | define a structure for object IDs | brian m. carlson | 2015-03-13 | 1 | -0/+8 |
* | | | | | | | | | | | | Git 2.4v2.4.0 | Junio C Hamano | 2015-04-30 | 2 | -1/+6 |
* | | | | | | | | | | | | Merge branch 'mh/multimail-renewal' | Junio C Hamano | 2015-04-28 | 2 | -24/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Update git-multimail to version 1.0.2mh/multimail-renewal | Michael Haggerty | 2015-04-28 | 2 | -24/+25 |
* | | | | | | | | | | | | | Merge branch 'mg/show-notes-doc' | Junio C Hamano | 2015-04-28 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | rev-list-options.txt: complete sentence about notes matchingmg/show-notes-doc | Michael J Gruber | 2015-04-17 | 1 | -2/+2 |