summaryrefslogtreecommitdiffstats
path: root/builtin
AgeCommit message (Expand)AuthorLines
2015-03-06Merge branch 'rs/simple-cleanups' into maintJunio C Hamano-4/+3
2015-03-05Merge branch 'es/blame-commit-info-fix' into maintJunio C Hamano-3/+2
2015-03-05Merge branch 'ab/merge-file-prefix' into maintJunio C Hamano-1/+2
2015-03-05Merge branch 'dp/remove-duplicated-header-inclusion' into maintJunio C Hamano-1/+0
2015-02-24Merge branch 'jc/apply-ws-fix-expands' into maintJunio C Hamano-3/+28
2015-02-24Merge branch 'mg/commit-author-no-match-malformed-message' into maintJunio C Hamano-1/+1
2015-02-24Merge branch 'dk/format-patch-ignore-diff-submodule' into maintJunio C Hamano-1/+1
2015-02-24Merge branch 'jk/blame-commit-label' into maintJunio C Hamano-24/+15
2015-02-22for-each-ref: use skip_prefix() to avoid duplicate string comparisonRené Scharfe-4/+3
2015-02-13do not include the same header twiceДилян Палаузов-1/+0
2015-02-11merge-file: correctly open files when in a subdirAleksander Boruch-Gruszecki-1/+2
2015-02-10builtin/blame: destroy initialized commit_info onlyEric Sunshine-3/+2
2015-01-26commit: reword --author error messageMichael J Gruber-1/+1
2015-01-22Merge branch 'ak/cat-file-clean-up'Junio C Hamano-2/+0
2015-01-22apply: count the size of postimage correctlyJunio C Hamano-2/+21
2015-01-22apply: make update_pre_post_images() sanity check the given postlenJunio C Hamano-0/+6
2015-01-22apply.c: typofixJunio C Hamano-1/+1
2015-01-20Merge branch 'ak/show-branch-usage-string'Junio C Hamano-3/+3
2015-01-20show-branch: fix indentation of usage stringRalf Thielow-3/+3
2015-01-14Merge branch 'rc/for-each-ref-tracking'Junio C Hamano-2/+9
2015-01-14Merge branch 'ak/fewer-includes'Junio C Hamano-4/+0
2015-01-14Merge branch 'ak/show-branch-usage-string'Junio C Hamano-1/+4
2015-01-14Merge branch 'km/log-usage-string-i18n'Junio C Hamano-2/+2
2015-01-14Merge branch 'js/remote-add-with-insteadof'Junio C Hamano-1/+3
2015-01-13cat-file: use "type" and "size" from outer scopeAlexander Kuleshov-2/+0
2015-01-13blame.c: fix garbled error messageLukas Fleischer-5/+7
2015-01-13builtin/commit.c: use xstrdup_or_null instead of envdupJeff King-9/+3
2015-01-13builtin/apply.c: use xstrdup_or_null instead of null_strdupJeff King-10/+5
2015-01-12for-each-ref: always check stat_tracking_info()'s return valueRaphael Kubo da Costa-2/+9
2015-01-12Merge branch 'mg/add-ignore-errors' into maintJunio C Hamano-1/+1
2015-01-12Merge branch 'bc/fetch-thin-less-aggressive-in-normal-repository'Junio C Hamano-1/+6
2015-01-12Merge branch 'rs/simplify-parsing-commit-tree-S'Junio C Hamano-3/+1
2015-01-12Merge branch 'rs/plug-strbuf-leak-in-merge'Junio C Hamano-0/+1
2015-01-12Merge branch 'es/checkout-index-temp'Junio C Hamano-8/+8
2015-01-09cat-file: remove unused includesAlexander Kuleshov-4/+0
2015-01-08show-branch: line-wrap show-branch usageAlexander Kuleshov-1/+4
2015-01-07format-patch: ignore diff.submodule settingDoug Kelly-1/+1
2015-01-07Merge branch 'jc/merge-bases'Junio C Hamano-5/+5
2015-01-07Merge branch 'jc/clone-borrow'Junio C Hamano-0/+20
2015-01-06log.c: fix translation markingsKyle J. McKay-2/+2
2014-12-29checkout-index: fix --temp relative path manglingEric Sunshine-8/+8
2014-12-29pack-objects: use --objects-edge-aggressive for shallow reposbrian m. carlson-1/+6
2014-12-29rev-list: add an option to mark fewer edges as uninterestingbrian m. carlson-1/+1
2014-12-29merge: release strbuf after use in suggest_conflicts()René Scharfe-0/+1
2014-12-29commit-tree: simplify parsing of option -S using skip_prefix()René Scharfe-3/+1
2014-12-29Merge branch 'mh/update-ref-verify'Junio C Hamano-9/+5
2014-12-23git remote: allow adding remotes agreeing with url.<...>.insteadOfJohannes Schindelin-1/+3
2014-12-22Sync with maintJunio C Hamano-1/+1
2014-12-22Merge branch 'rs/use-strbuf-complete-line'Junio C Hamano-2/+1
2014-12-22Merge branch 'jk/commit-date-approxidate'Junio C Hamano-30/+18