summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2015-07-24rerere: use "struct rerere_id" instead of "char *" for conflict IDLibravatar Junio C Hamano1-1/+1
2015-07-24rerere: call conflict-ids IDsLibravatar Junio C Hamano1-2/+2
2015-05-11Merge branch 'oh/fix-config-default-user-name-section' into maint-2.3Libravatar Junio C Hamano1-2/+2
2015-04-17config: fix settings in default_user_config templateLibravatar Ossi Herrala1-2/+2
2015-03-31Merge branch 'jc/report-path-error-to-dir' into maintLibravatar Junio C Hamano1-43/+0
2015-03-28Merge branch 'ws/grep-quiet-no-pager' into maintLibravatar Junio C Hamano1-1/+1
2015-03-28Merge branch 'jk/cleanup-failed-clone' into maintLibravatar Junio C Hamano1-5/+6
2015-03-28Merge branch 'jk/prune-with-corrupt-refs' into maintLibravatar Junio C Hamano2-2/+7
2015-03-27Merge branch 'jk/tag-h-column-is-a-listing-option' into maintLibravatar Junio C Hamano1-2/+2
2015-03-24report_path_error(): move to dir.cLibravatar Junio C Hamano1-43/+0
2015-03-23Merge branch 'rs/deflate-init-cleanup' into maintLibravatar Junio C Hamano2-3/+0
2015-03-20repack: turn on "ref paranoia" when doing a destructive repackLibravatar Jeff King1-2/+6
2015-03-20prune: turn on ref_paranoia flagLibravatar Jeff King1-0/+1
2015-03-19clone: drop period from end of die_errno messageLibravatar Jeff King1-1/+1
2015-03-19clone: initialize atexit cleanup handler earlierLibravatar Jeff King1-4/+5
2015-03-19grep: fix "--quiet" overwriting current outputLibravatar Wilhelm Schuermann1-1/+1
2015-03-13Merge branch 'nd/grep-exclude-standard-help-fix' into maintLibravatar Junio C Hamano1-1/+1
2015-03-13Merge branch 'jc/apply-beyond-symlink' into maintLibravatar Junio C Hamano1-1/+141
2015-03-12tag: fix some mis-organized options in "-h" listingLibravatar Jeff King1-2/+2
2015-03-06Merge branch 'rs/simple-cleanups' into maintLibravatar Junio C Hamano1-4/+3
2015-03-05zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}Libravatar René Scharfe2-3/+0
2015-03-05Merge branch 'es/blame-commit-info-fix' into maintLibravatar Junio C Hamano1-3/+2
2015-03-05Merge branch 'ab/merge-file-prefix' into maintLibravatar Junio C Hamano1-1/+2
2015-03-05Merge branch 'dp/remove-duplicated-header-inclusion' into maintLibravatar Junio C Hamano1-1/+0
2015-02-27grep: correct help string for --exclude-standardLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2015-02-24Merge branch 'jc/apply-ws-fix-expands' into maintLibravatar Junio C Hamano1-3/+28
2015-02-24Merge branch 'mg/commit-author-no-match-malformed-message' into maintLibravatar Junio C Hamano1-1/+1
2015-02-24Merge branch 'dk/format-patch-ignore-diff-submodule' into maintLibravatar Junio C Hamano1-1/+1
2015-02-24Merge branch 'jk/blame-commit-label' into maintLibravatar Junio C Hamano3-24/+15
2015-02-22for-each-ref: use skip_prefix() to avoid duplicate string comparisonLibravatar René Scharfe1-4/+3
2015-02-13do not include the same header twiceLibravatar Дилян Палаузов1-1/+0
2015-02-11merge-file: correctly open files when in a subdirLibravatar Aleksander Boruch-Gruszecki1-1/+2
2015-02-10apply: do not touch a file beyond a symbolic linkLibravatar Junio C Hamano1-0/+112
2015-02-10apply: do not read from beyond a symbolic linkLibravatar Junio C Hamano1-0/+2
2015-02-10apply: do not read from the filesystem under --indexLibravatar Junio C Hamano1-1/+1
2015-02-10apply: reject input that touches outside the working areaLibravatar Junio C Hamano1-0/+26
2015-02-10builtin/blame: destroy initialized commit_info onlyLibravatar Eric Sunshine1-3/+2
2015-01-26commit: reword --author error messageLibravatar Michael J Gruber1-1/+1
2015-01-22Merge branch 'ak/cat-file-clean-up'Libravatar Junio C Hamano1-2/+0
2015-01-22apply: count the size of postimage correctlyLibravatar Junio C Hamano1-2/+21
2015-01-22apply: make update_pre_post_images() sanity check the given postlenLibravatar Junio C Hamano1-0/+6
2015-01-22apply.c: typofixLibravatar Junio C Hamano1-1/+1
2015-01-20Merge branch 'ak/show-branch-usage-string'Libravatar Junio C Hamano1-3/+3
2015-01-20show-branch: fix indentation of usage stringLibravatar Ralf Thielow1-3/+3
2015-01-14Merge branch 'rc/for-each-ref-tracking'Libravatar Junio C Hamano1-2/+9
2015-01-14Merge branch 'ak/fewer-includes'Libravatar Junio C Hamano1-4/+0
2015-01-14Merge branch 'ak/show-branch-usage-string'Libravatar Junio C Hamano1-1/+4
2015-01-14Merge branch 'km/log-usage-string-i18n'Libravatar Junio C Hamano1-2/+2
2015-01-14Merge branch 'js/remote-add-with-insteadof'Libravatar Junio C Hamano1-1/+3
2015-01-13cat-file: use "type" and "size" from outer scopeLibravatar Alexander Kuleshov1-2/+0