aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jc/report-path-error-to-dir' into maintJunio C Hamano2015-03-31
|\
| * report_path_error(): move to dir.cJunio C Hamano2015-03-24
* | Merge branch 'ws/grep-quiet-no-pager' into maintJunio C Hamano2015-03-28
|\ \
| * | grep: fix "--quiet" overwriting current outputWilhelm Schuermann2015-03-19
| |/
* | Merge branch 'jk/cleanup-failed-clone' into maintJunio C Hamano2015-03-28
|\ \
| * | clone: drop period from end of die_errno messageJeff King2015-03-19
| * | clone: initialize atexit cleanup handler earlierJeff King2015-03-19
| |/
* | Merge branch 'jk/prune-with-corrupt-refs' into maintJunio C Hamano2015-03-28
|\ \
| * | repack: turn on "ref paranoia" when doing a destructive repackJeff King2015-03-20
| * | prune: turn on ref_paranoia flagJeff King2015-03-20
* | | Merge branch 'jk/tag-h-column-is-a-listing-option' into maintJunio C Hamano2015-03-27
|\ \ \
| * | | tag: fix some mis-organized options in "-h" listingJeff King2015-03-12
* | | | Merge branch 'rs/deflate-init-cleanup' into maintJunio C Hamano2015-03-23
|\ \ \ \ | |_|/ / |/| | |
| * | | zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}René Scharfe2015-03-05
| | |/ | |/|
* | | Merge branch 'nd/grep-exclude-standard-help-fix' into maintJunio C Hamano2015-03-13
|\ \ \
| * | | grep: correct help string for --exclude-standardNguyễn Thái Ngọc Duy2015-02-27
| |/ /
* | | Merge branch 'jc/apply-beyond-symlink' into maintJunio C Hamano2015-03-13
|\ \ \
| * | | apply: do not touch a file beyond a symbolic linkJunio C Hamano2015-02-10
| * | | apply: do not read from beyond a symbolic linkJunio C Hamano2015-02-10
| * | | apply: do not read from the filesystem under --indexJunio C Hamano2015-02-10
| * | | apply: reject input that touches outside the working areaJunio C Hamano2015-02-10
* | | | Merge branch 'rs/simple-cleanups' into maintJunio C Hamano2015-03-06
|\ \ \ \
| * | | | for-each-ref: use skip_prefix() to avoid duplicate string comparisonRené Scharfe2015-02-22
* | | | | Merge branch 'es/blame-commit-info-fix' into maintJunio C Hamano2015-03-05
|\ \ \ \ \
| * | | | | builtin/blame: destroy initialized commit_info onlyEric Sunshine2015-02-10
| | |/ / / | |/| | |
* | | | | Merge branch 'ab/merge-file-prefix' into maintJunio C Hamano2015-03-05
|\ \ \ \ \
| * | | | | merge-file: correctly open files when in a subdirAleksander Boruch-Gruszecki2015-02-11
| |/ / / /
* | | | | Merge branch 'dp/remove-duplicated-header-inclusion' into maintJunio C Hamano2015-03-05
|\ \ \ \ \
| * | | | | do not include the same header twiceДилян Палаузов2015-02-13
* | | | | | Merge branch 'jc/apply-ws-fix-expands' into maintJunio C Hamano2015-02-24
|\ \ \ \ \ \
| * | | | | | apply: count the size of postimage correctlyJunio C Hamano2015-01-22
| * | | | | | apply: make update_pre_post_images() sanity check the given postlenJunio C Hamano2015-01-22
| * | | | | | apply.c: typofixJunio C Hamano2015-01-22
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'mg/commit-author-no-match-malformed-message' into maintJunio C Hamano2015-02-24
|\ \ \ \ \ \
| * | | | | | commit: reword --author error messageMichael J Gruber2015-01-26
| |/ / / / /
* | | | | | Merge branch 'dk/format-patch-ignore-diff-submodule' into maintJunio C Hamano2015-02-24
|\ \ \ \ \ \
| * | | | | | format-patch: ignore diff.submodule settingDoug Kelly2015-01-07
* | | | | | | Merge branch 'jk/blame-commit-label' into maintJunio C Hamano2015-02-24
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | blame.c: fix garbled error messageLukas Fleischer2015-01-13
| * | | | | | builtin/commit.c: use xstrdup_or_null instead of envdupJeff King2015-01-13
| * | | | | | builtin/apply.c: use xstrdup_or_null instead of null_strdupJeff King2015-01-13
* | | | | | | Merge branch 'ak/cat-file-clean-up'Junio C Hamano2015-01-22
|\ \ \ \ \ \ \
| * | | | | | | cat-file: use "type" and "size" from outer scopeAlexander Kuleshov2015-01-13
| * | | | | | | Merge branch 'mg/add-ignore-errors' into maintJunio C Hamano2015-01-12
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ak/show-branch-usage-string'Junio C Hamano2015-01-20
|\ \ \ \ \ \ \ \
| * | | | | | | | show-branch: fix indentation of usage stringRalf Thielow2015-01-20
* | | | | | | | | Merge branch 'rc/for-each-ref-tracking'Junio C Hamano2015-01-14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | for-each-ref: always check stat_tracking_info()'s return valueRaphael Kubo da Costa2015-01-12
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ak/fewer-includes'Junio C Hamano2015-01-14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | cat-file: remove unused includesAlexander Kuleshov2015-01-09
| | |_|/ / / / / / | |/| | | | | | |