summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/fast-import-cleanup'Junio C Hamano2017-03-281-4/+8
|\
| * pack.h: define largest possible encoded object sizejk/fast-import-cleanupJeff King2017-03-241-2/+4
| * encode_in_pack_object_header: respect output buffer lengthJeff King2017-03-241-2/+4
| * Merge branch 'jk/show-branch-lift-name-len-limit' into maintJunio C Hamano2017-03-211-29/+13
| |\
| * \ Merge branch 'rl/remote-allow-missing-branch-name-merge' into maintJunio C Hamano2017-03-211-1/+3
| |\ \
| * \ \ Merge branch 'dt/gc-ignore-old-gc-logs' into maintJunio C Hamano2017-03-211-7/+50
| |\ \ \
* | \ \ \ Merge branch 'sb/checkout-recurse-submodules'Junio C Hamano2017-03-284-21/+60
|\ \ \ \ \
| * | | | | builtin/read-tree: add --recurse-submodules switchStefan Beller2017-03-161-0/+29
| * | | | | builtin/checkout: add --recurse-submodules switchStefan Beller2017-03-161-0/+28
| * | | | | make is_submodule_populated gentlyStefan Beller2017-03-151-1/+1
| * | | | | submodule--helper.c: remove duplicate codeValery Tolstov2017-03-151-20/+2
* | | | | | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-03-281-12/+9
|\ \ \ \ \ \
| * | | | | | grep: fix builds with with no thread supportBrandon Williams2017-03-181-12/+9
* | | | | | | Merge branch 'sb/describe-broken'Junio C Hamano2017-03-271-9/+38
|\ \ \ \ \ \ \
| * | | | | | | builtin/describe: introduce --broken flagsb/describe-brokenStefan Beller2017-03-221-9/+38
* | | | | | | | Merge branch 'sb/push-options-via-transport'Junio C Hamano2017-03-271-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | remote-curl: allow push optionssb/push-options-via-transportBrandon Williams2017-03-221-0/+5
* | | | | | | | | Merge branch 'jk/prefix-filename'Junio C Hamano2017-03-278-38/+27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | bundle: use prefix_filename with bundle pathjk/prefix-filenameJeff King2017-03-211-7/+1
| * | | | | | | | | prefix_filename: return newly allocated stringJeff King2017-03-217-18/+21
| * | | | | | | | | prefix_filename: drop length parameterJeff King2017-03-217-20/+9
| * | | | | | | | | hash-object: fix buffer reuse with --path in a subdirectoryJeff King2017-03-211-2/+5
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs/update-hook-optim'Junio C Hamano2017-03-241-8/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | receive-pack: simplify run_update_post_hook()rs/update-hook-optimRené Scharfe2017-03-181-8/+5
* | | | | | | | | | Merge branch 'rs/shortlog-cleanup'Junio C Hamano2017-03-241-1/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | shortlog: don't set after_subject to an empty stringrs/shortlog-cleanupRené Scharfe2017-03-181-1/+0
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/pack-name-cleanups'Junio C Hamano2017-03-211-16/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | index-pack: make pointer-alias fallbacks saferjk/pack-name-cleanupsJeff King2017-03-161-8/+12
| * | | | | | | | | | replace snprintf with odb_pack_name()Jeff King2017-03-161-16/+11
| * | | | | | | | | | odb_pack_keep(): stop generating keepfile nameJeff King2017-03-161-3/+3
* | | | | | | | | | | Merge branch 'jk/rev-parse-cleanup'Junio C Hamano2017-03-211-52/+57
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | rev-parse: simplify parsing of ref optionsjk/rev-parse-cleanupJeff King2017-03-151-29/+16
| * | | | | | | | | | rev-parse: add helper for parsing "--foo/--foo="Jeff King2017-03-151-10/+28
| * | | | | | | | | | rev-parse: use skip_prefix when parsing optionsJeff King2017-03-151-20/+20
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'js/difftool-builtin'Junio C Hamano2017-03-201-5/+46
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | difftool: handle modified symlinks in dir-diff modeDavid Aguilar2017-03-151-5/+46
* | | | | | | | | | | Merge branch 'jk/cherry-pick-0-mainline'Junio C Hamano2017-03-171-1/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | cherry-pick: detect bogus arguments to --mainlinejk/cherry-pick-0-mainlineJeff King2017-03-151-1/+20
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'sb/rev-parse-show-superproject-root'Junio C Hamano2017-03-171-0/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rev-parse: add --show-superproject-working-treeStefan Beller2017-03-081-0/+7
* | | | | | | | | | | | Merge branch 'bc/object-id'Junio C Hamano2017-03-1720-360/+357
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | builtin/merge-base: convert to struct object_idbrian m. carlson2017-02-221-14/+14
| * | | | | | | | | | | | Convert object iteration callbacks to struct object_idbrian m. carlson2017-02-226-27/+27
| * | | | | | | | | | | | refs: convert each_reflog_ent_fn to struct object_idbrian m. carlson2017-02-223-12/+12
| * | | | | | | | | | | | builtin/replace: convert to struct object_idbrian m. carlson2017-02-221-56/+56
| * | | | | | | | | | | | Convert remaining callers of resolve_refdup to object_idbrian m. carlson2017-02-222-11/+11
| * | | | | | | | | | | | builtin/merge: convert to struct object_idbrian m. carlson2017-02-221-68/+66
| * | | | | | | | | | | | builtin/clone: convert to struct object_idbrian m. carlson2017-02-221-5/+5
| * | | | | | | | | | | | builtin/branch: convert to struct object_idbrian m. carlson2017-02-221-13/+13
| * | | | | | | | | | | | builtin/grep: convert to struct object_idbrian m. carlson2017-02-221-12/+12