summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | Merge branch 'rc/for-each-ref-tracking'Junio C Hamano2015-01-141-2/+9
|\ \ \ \
| * | | | for-each-ref: always check stat_tracking_info()'s return valuerc/for-each-ref-trackingRaphael Kubo da Costa2015-01-121-2/+9
* | | | | Merge branch 'ak/fewer-includes'Junio C Hamano2015-01-141-4/+0
|\ \ \ \ \
| * | | | | cat-file: remove unused includesak/fewer-includesAlexander Kuleshov2015-01-091-4/+0
| | |_|/ / | |/| | |
* | | | | Merge branch 'ak/show-branch-usage-string'Junio C Hamano2015-01-141-1/+4
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | show-branch: line-wrap show-branch usageAlexander Kuleshov2015-01-081-1/+4
| | |/ / | |/| |
* | | | Merge branch 'km/log-usage-string-i18n'Junio C Hamano2015-01-141-2/+2
|\ \ \ \
| * | | | log.c: fix translation markingskm/log-usage-string-i18nKyle J. McKay2015-01-061-2/+2
| |/ / /
* | | | Merge branch 'js/remote-add-with-insteadof'Junio C Hamano2015-01-141-1/+3
|\ \ \ \
| * | | | git remote: allow adding remotes agreeing with url.<...>.insteadOfJohannes Schindelin2014-12-231-1/+3
* | | | | Merge branch 'bc/fetch-thin-less-aggressive-in-normal-repository'Junio C Hamano2015-01-121-1/+6
|\ \ \ \ \
| * | | | | pack-objects: use --objects-edge-aggressive for shallow reposbc/fetch-thin-less-aggressive-in-normal-repositorybrian m. carlson2014-12-291-1/+6
| * | | | | rev-list: add an option to mark fewer edges as uninterestingbrian m. carlson2014-12-291-1/+1
* | | | | | Merge branch 'rs/simplify-parsing-commit-tree-S'Junio C Hamano2015-01-121-3/+1
|\ \ \ \ \ \
| * | | | | | commit-tree: simplify parsing of option -S using skip_prefix()rs/simplify-parsing-commit-tree-SRené Scharfe2014-12-291-3/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'rs/plug-strbuf-leak-in-merge'Junio C Hamano2015-01-121-0/+1
|\ \ \ \ \ \
| * | | | | | merge: release strbuf after use in suggest_conflicts()rs/plug-strbuf-leak-in-mergeRené Scharfe2014-12-291-0/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'es/checkout-index-temp'Junio C Hamano2015-01-121-8/+8
|\ \ \ \ \ \
| * | | | | | checkout-index: fix --temp relative path manglinges/checkout-index-tempEric Sunshine2014-12-291-8/+8
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jc/merge-bases'Junio C Hamano2015-01-073-5/+5
|\ \ \ \ \ \
| * | | | | | get_merge_bases(): always clean-up object flagsjc/merge-basesJunio C Hamano2014-10-303-5/+5
| |/ / / / /
* | | | | | Merge branch 'jc/clone-borrow'Junio C Hamano2015-01-071-0/+20
|\ \ \ \ \ \
| * | | | | | clone: --dissociate option to mark that reference is only temporaryjc/clone-borrowJunio C Hamano2014-10-151-0/+20
* | | | | | | Merge branch 'mh/update-ref-verify'Junio C Hamano2014-12-291-9/+5
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | update-ref: fix "verify" command with missing <oldvalue>mh/update-ref-verifyMichael Haggerty2014-12-111-9/+5
* | | | | | | Sync with maintJunio C Hamano2014-12-221-1/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'jk/push-simple' into maintJunio C Hamano2014-12-221-4/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'mh/config-flip-xbit-back-after-checking' into maintJunio C Hamano2014-12-221-1/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rs/receive-pack-use-labs' into maintJunio C Hamano2014-12-221-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/colors-fix' into maintJunio C Hamano2014-12-221-14/+13
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/checkout-from-tree' into maintJunio C Hamano2014-12-221-0/+18
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | clean: typofixAlexander Kuleshov2014-12-221-1/+1
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'rs/use-strbuf-complete-line'Junio C Hamano2014-12-221-2/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | use strbuf_complete_line() for adding a newline if neededrs/use-strbuf-complete-lineRené Scharfe2014-12-121-2/+1
* | | | | | | | | | | | Merge branch 'jk/commit-date-approxidate'Junio C Hamano2014-12-221-30/+18
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | commit: always populate GIT_AUTHOR_* variablesjk/commit-date-approxidateJeff King2014-12-111-21/+5
| * | | | | | | | | | | | commit: loosen ident checks when generating templateJeff King2014-12-111-9/+14
* | | | | | | | | | | | | Merge branch 'js/fsck-tag-validation'Junio C Hamano2014-12-222-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | index-pack: terminate object buffers with NULjs/fsck-tag-validationDuy Nguyen2014-12-092-3/+3
* | | | | | | | | | | | | | Merge branch 'mg/branch-d-m-f'Junio C Hamano2014-12-221-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | branch: allow -f with -m and -dmg/branch-d-m-fMichael J Gruber2014-12-091-4/+9
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'nd/ls-tree-pathspec'Junio C Hamano2014-12-223-14/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | ls-tree: disable negative pathspec because it's not supportedNguyễn Thái Ngọc Duy2014-12-011-1/+2
| * | | | | | | | | | | | | | ls-tree: remove path filtering logic in show_treeNguyễn Thái Ngọc Duy2014-12-011-7/+7
| * | | | | | | | | | | | | | tree.c: update read_tree_recursive callback to pass strbuf as baseNguyễn Thái Ngọc Duy2014-12-013-9/+10
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
View Lorry Controller Status