aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* 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
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ak/show-branch-usage-string'Junio C Hamano2015-01-14
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | show-branch: line-wrap show-branch usageAlexander Kuleshov2015-01-08
| | |/ / / | |/| | |
* | | | | Merge branch 'km/log-usage-string-i18n'Junio C Hamano2015-01-14
|\ \ \ \ \
| * | | | | log.c: fix translation markingsKyle J. McKay2015-01-06
| |/ / / /
* | | | | Merge branch 'js/remote-add-with-insteadof'Junio C Hamano2015-01-14
|\ \ \ \ \
| * | | | | git remote: allow adding remotes agreeing with url.<...>.insteadOfJohannes Schindelin2014-12-23
* | | | | | Merge branch 'bc/fetch-thin-less-aggressive-in-normal-repository'Junio C Hamano2015-01-12
|\ \ \ \ \ \
| * | | | | | pack-objects: use --objects-edge-aggressive for shallow reposbrian m. carlson2014-12-29
| * | | | | | rev-list: add an option to mark fewer edges as uninterestingbrian m. carlson2014-12-29
* | | | | | | Merge branch 'rs/simplify-parsing-commit-tree-S'Junio C Hamano2015-01-12
|\ \ \ \ \ \ \
| * | | | | | | commit-tree: simplify parsing of option -S using skip_prefix()René Scharfe2014-12-29
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'rs/plug-strbuf-leak-in-merge'Junio C Hamano2015-01-12
|\ \ \ \ \ \ \
| * | | | | | | merge: release strbuf after use in suggest_conflicts()René Scharfe2014-12-29
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'es/checkout-index-temp'Junio C Hamano2015-01-12
|\ \ \ \ \ \ \
| * | | | | | | checkout-index: fix --temp relative path manglingEric Sunshine2014-12-29
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jc/merge-bases'Junio C Hamano2015-01-07
|\ \ \ \ \ \ \
| * | | | | | | get_merge_bases(): always clean-up object flagsJunio C Hamano2014-10-30
| |/ / / / / /
* | | | | | | Merge branch 'jc/clone-borrow'Junio C Hamano2015-01-07
|\ \ \ \ \ \ \
| * | | | | | | clone: --dissociate option to mark that reference is only temporaryJunio C Hamano2014-10-15
* | | | | | | | Merge branch 'mh/update-ref-verify'Junio C Hamano2014-12-29
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | update-ref: fix "verify" command with missing <oldvalue>Michael Haggerty2014-12-11
* | | | | | | | Sync with maintJunio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'jk/push-simple' into maintJunio C Hamano2014-12-22
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mh/config-flip-xbit-back-after-checking' into maintJunio C Hamano2014-12-22
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rs/receive-pack-use-labs' into maintJunio C Hamano2014-12-22
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/colors-fix' into maintJunio C Hamano2014-12-22
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/checkout-from-tree' into maintJunio C Hamano2014-12-22
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | clean: typofixAlexander Kuleshov2014-12-22
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rs/use-strbuf-complete-line'Junio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \ \ \ \