Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | dir: remove unused variable sbrs/janitorial | René Scharfe | 2015-05-20 | 1 | -2/+0 |
* | clean: remove unused variable buf | René Scharfe | 2015-05-20 | 1 | -2/+0 |
* | use file_exists() to check if a file exists in the worktree | René Scharfe | 2015-05-20 | 5 | -22/+9 |
* | Git 2.4.1v2.4.1 | Junio C Hamano | 2015-05-13 | 4 | -3/+44 |
* | Merge branch 'sb/line-log-plug-pairdiff-leak' into maint | Junio C Hamano | 2015-05-13 | 1 | -0/+1 |
|\ | |||||
| * | line-log.c: fix a memleaksb/line-log-plug-pairdiff-leak | Stefan Beller | 2015-03-30 | 1 | -0/+1 |
* | | Merge branch 'sb/test-bitmap-free-at-end' into maint | Junio C Hamano | 2015-05-13 | 1 | -0/+2 |
|\ \ | |||||
| * | | pack-bitmap.c: fix a memleak | Stefan Beller | 2015-04-12 | 1 | -0/+2 |
* | | | Merge branch 'nd/t1509-chroot-test' into maint | Junio C Hamano | 2015-05-13 | 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 'jk/type-from-string-gently' into maint | Junio C Hamano | 2015-05-13 | 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 'ep/fix-test-lib-functions-report' into maint | Junio C Hamano | 2015-05-13 | 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' into maint | Junio C Hamano | 2015-05-13 | 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 'jk/prune-mtime' into maint | Junio C Hamano | 2015-05-13 | 3 | -9/+26 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | sha1_file: only freshen packs once per run | Jeff King | 2015-04-20 | 2 | -1/+9 |
| * | | | | | | | sha1_file: freshen pack objects before loose | Jeff King | 2015-04-20 | 1 | -1/+1 |
| * | | | | | | | reachable: only mark local objects as recent | Jeff King | 2015-04-20 | 3 | -7/+16 |
* | | | | | | | | Merge branch 'jk/init-core-worktree-at-root' into maint | Junio C Hamano | 2015-05-13 | 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 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Sync with 2.3.8 | Junio C Hamano | 2015-05-11 | 12 | -25/+149 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Git 2.3.8v2.3.8 | Junio C Hamano | 2015-05-11 | 4 | -3/+26 |
| * | | | | | | | | Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3 | Junio C Hamano | 2015-05-11 | 6 | -15/+16 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | log -L: improve error message on malformed argumentmm/usage-log-l-can-take-regex | Matthieu Moy | 2015-04-20 | 2 | -5/+5 |
| | * | | | | | | | | Documentation: change -L:<regex> to -L:<funcname> | Matthieu Moy | 2015-04-20 | 4 | -10/+11 |
| | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'jc/diff-no-index-d-f' into maint-2.3 | Junio C Hamano | 2015-05-11 | 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 'oh/fix-config-default-user-name-section' into maint-2.3 | Junio C Hamano | 2015-05-11 | 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 'jc/epochtime-wo-tz' into maint-2.3 | Junio C Hamano | 2015-05-11 | 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 |
| | | |/ / / / / / / | | |/| | | | | | | | |||||
* | | | | | | | | | | 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 |
* | | | | | | | | | | | Merge branch 'nd/versioncmp-prereleases' | Junio C Hamano | 2015-04-28 | 1 | -4/+7 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | git tag: mention versionsort.prereleaseSuffix in manpagend/versioncmp-prereleases | Michael Haggerty | 2015-04-23 | 1 | -4/+7 |
* | | | | | | | | | | | | Merge branch 'mg/status-v-v' | Junio C Hamano | 2015-04-28 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | status: document the -v/--verbose optionmg/status-v-v | Michael Haggerty | 2015-04-23 | 1 | -0/+8 |
* | | | | | | | | | | | | | Sync with 2.3.7 | Junio C Hamano | 2015-04-27 | 2 | -1/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Git 2.3.7v2.3.7 | Junio C Hamano | 2015-04-27 | 4 | -3/+25 |