summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* rerere: use "struct rerere_id" instead of "char *" for conflict IDJunio C Hamano2015-07-241-1/+1
* rerere: call conflict-ids IDsJunio C Hamano2015-07-241-2/+2
* 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/report-path-error-to-dir' into maintJunio C Hamano2015-03-311-43/+0
|\ \
| * | report_path_error(): move to dir.cjc/report-path-error-to-dirJunio C Hamano2015-03-241-43/+0
* | | Merge branch 'ws/grep-quiet-no-pager' into maintJunio C Hamano2015-03-281-1/+1
|\ \ \
| * | | grep: fix "--quiet" overwriting current outputws/grep-quiet-no-pagerWilhelm Schuermann2015-03-191-1/+1
| |/ /
* | | Merge branch 'jk/cleanup-failed-clone' into maintJunio C Hamano2015-03-281-5/+6
|\ \ \
| * | | clone: drop period from end of die_errno messagejk/cleanup-failed-cloneJeff King2015-03-191-1/+1
| * | | clone: initialize atexit cleanup handler earlierJeff King2015-03-191-4/+5
| |/ /
* | | Merge branch 'jk/prune-with-corrupt-refs' into maintJunio C Hamano2015-03-282-2/+7
|\ \ \
| * | | repack: turn on "ref paranoia" when doing a destructive repackJeff King2015-03-201-2/+6
| * | | prune: turn on ref_paranoia flagJeff King2015-03-201-0/+1
* | | | Merge branch 'jk/tag-h-column-is-a-listing-option' into maintJunio C Hamano2015-03-271-2/+2
|\ \ \ \
| * | | | tag: fix some mis-organized options in "-h" listingjk/tag-h-column-is-a-listing-optionJeff King2015-03-121-2/+2
* | | | | Merge branch 'rs/deflate-init-cleanup' into maintJunio C Hamano2015-03-232-3/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}rs/deflate-init-cleanupRené Scharfe2015-03-052-3/+0
| | |/ / | |/| |
* | | | Merge branch 'nd/grep-exclude-standard-help-fix' into maintJunio C Hamano2015-03-131-1/+1
|\ \ \ \
| * | | | grep: correct help string for --exclude-standardnd/grep-exclude-standard-help-fixNguyễn Thái Ngọc Duy2015-02-271-1/+1
| |/ / /
* | | | Merge branch 'jc/apply-beyond-symlink' into maintJunio C Hamano2015-03-131-1/+141
|\ \ \ \
| * | | | apply: do not touch a file beyond a symbolic linkjc/apply-beyond-symlinkJunio C Hamano2015-02-101-0/+112
| * | | | apply: do not read from beyond a symbolic linkJunio C Hamano2015-02-101-0/+2
| * | | | apply: do not read from the filesystem under --indexJunio C Hamano2015-02-101-1/+1
| * | | | apply: reject input that touches outside the working areaJunio C Hamano2015-02-101-0/+26
* | | | | Merge branch 'rs/simple-cleanups' into maintJunio C Hamano2015-03-061-4/+3
|\ \ \ \ \
| * | | | | for-each-ref: use skip_prefix() to avoid duplicate string comparisonRené Scharfe2015-02-221-4/+3
* | | | | | Merge branch 'es/blame-commit-info-fix' into maintJunio C Hamano2015-03-051-3/+2
|\ \ \ \ \ \
| * | | | | | builtin/blame: destroy initialized commit_info onlyes/blame-commit-info-fixEric Sunshine2015-02-101-3/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ab/merge-file-prefix' into maintJunio C Hamano2015-03-051-1/+2
|\ \ \ \ \ \
| * | | | | | merge-file: correctly open files when in a subdirab/merge-file-prefixAleksander Boruch-Gruszecki2015-02-111-1/+2
| |/ / / / /
* | | | | | Merge branch 'dp/remove-duplicated-header-inclusion' into maintJunio C Hamano2015-03-051-1/+0
|\ \ \ \ \ \
| * | | | | | do not include the same header twicedp/remove-duplicated-header-inclusionДилян Палаузов2015-02-131-1/+0
* | | | | | | Merge branch 'jc/apply-ws-fix-expands' into maintJunio C Hamano2015-02-241-3/+28
|\ \ \ \ \ \ \
| * | | | | | | apply: count the size of postimage correctlyjc/apply-ws-fix-expandsJunio C Hamano2015-01-221-2/+21
| * | | | | | | apply: make update_pre_post_images() sanity check the given postlenJunio C Hamano2015-01-221-0/+6
| * | | | | | | apply.c: typofixJunio C Hamano2015-01-221-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'mg/commit-author-no-match-malformed-message' into maintJunio C Hamano2015-02-241-1/+1
|\ \ \ \ \ \ \
| * | | | | | | commit: reword --author error messagemg/commit-author-no-match-malformed-messageMichael J Gruber2015-01-261-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'dk/format-patch-ignore-diff-submodule' into maintJunio C Hamano2015-02-241-1/+1
|\ \ \ \ \ \ \
| * | | | | | | format-patch: ignore diff.submodule settingdk/format-patch-ignore-diff-submoduleDoug Kelly2015-01-071-1/+1
* | | | | | | | Merge branch 'jk/blame-commit-label' into maintJunio C Hamano2015-02-243-24/+15
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | blame.c: fix garbled error messagejk/blame-commit-labelLukas Fleischer2015-01-131-5/+7
| * | | | | | | builtin/commit.c: use xstrdup_or_null instead of envdupJeff King2015-01-131-9/+3
| * | | | | | | builtin/apply.c: use xstrdup_or_null instead of null_strdupJeff King2015-01-131-10/+5
* | | | | | | | Merge branch 'ak/cat-file-clean-up'Junio C Hamano2015-01-221-2/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | cat-file: use "type" and "size" from outer scopeak/cat-file-clean-upAlexander Kuleshov2015-01-131-2/+0
| * | | | | | | | Merge branch 'mg/add-ignore-errors' into maintJunio C Hamano2015-01-121-1/+1
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ak/show-branch-usage-string'Junio C Hamano2015-01-201-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | show-branch: fix indentation of usage stringak/show-branch-usage-stringRalf Thielow2015-01-201-3/+3
View Lorry Controller Status