summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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 'jk/push-simple'Junio C Hamano2014-12-121-4/+4
|\
| * push: truly use "simple" as default, not "upstream"jk/push-simpleJeff King2014-11-301-4/+4
* | Merge branch 'jk/colors-fix'Junio C Hamano2014-12-121-14/+13
|\ \
| * | config: fix parsing of "git config --get-color some.key -1"Jeff King2014-11-201-14/+13
| * | Merge branch 'rs/clean-menu-item-defn' into maintJunio C Hamano2014-11-111-1/+1
| |\ \
| * \ \ Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maintJunio C Hamano2014-10-291-0/+1
| |\ \ \
| * \ \ \ Merge branch 'jk/mbox-from-line' into maintJunio C Hamano2014-10-071-1/+17
| |\ \ \ \
* | \ \ \ \ Merge branch 'rt/push-recurse-submodule-usage-string'Junio C Hamano2014-12-121-1/+1
|\ \ \ \ \ \
| * | | | | | builtin/push.c: fix description of --recurse-submodules optionrt/push-recurse-submodule-usage-stringRalf Thielow2014-11-181-1/+1
* | | | | | | Merge branch 'sv/typofix-apply-error-message'Junio C Hamano2014-12-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | apply: fix typo in an error messagesv/typofix-apply-error-messageSlavomir Vlcek2014-11-171-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'mh/config-copy-string-from-git-path'Junio C Hamano2014-12-121-2/+5
|\ \ \ \ \ \ \
| * | | | | | | cmd_config(): make a copy of path obtained from git_path()mh/config-copy-string-from-git-pathMichael Haggerty2014-11-171-2/+5
* | | | | | | | Merge branch 'mh/config-flip-xbit-back-after-checking'Junio C Hamano2014-12-051-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | create_default_files(): don't set u+x bit on $GIT_DIR/configmh/config-flip-xbit-back-after-checkingMichael Haggerty2014-11-181-1/+2
* | | | | | | | | Merge branch 'rs/receive-pack-use-labs'Junio C Hamano2014-12-051-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | use labs() for variables of type long instead of abs()rs/receive-pack-use-labsRené Scharfe2014-11-171-1/+1
* | | | | | | | | | Merge branch 'jh/empty-notes'Junio C Hamano2014-12-051-123/+135
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | builtin/notes: add --allow-empty, to allow storing empty notesJohan Herland2014-11-121-6/+11
| * | | | | | | | | | builtin/notes: split create_note() to clarify add vs. remove logicJohan Herland2014-11-121-49/+54
| * | | | | | | | | | builtin/notes: simplify early exit code in add()Johan Herland2014-11-121-18/+17
| * | | | | | | | | | builtin/notes: refactor note file path into struct note_dataJohan Herland2014-11-101-17/+21
| * | | | | | | | | | builtin/notes: improve namingJohan Herland2014-11-101-55/+54
| * | | | | | | | | | builtin/notes: fix premature failure when trying to add the empty blobJohan Herland2014-11-101-1/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/checkout-from-tree'Junio C Hamano2014-12-051-0/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | checkout $tree: do not throw away unchanged index entriesjk/checkout-from-treeJeff King2014-11-131-0/+18
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | use args member of struct child_processrs/env-array-in-child-processRené Scharfe2014-11-101-25/+22
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'jk/fetch-reflog-df-conflict'Junio C Hamano2014-11-061-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fetch: load all default config at startupJeff King2014-11-041-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/push-cert'Junio C Hamano2014-10-311-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | receive-pack: avoid minor leak in case start_async() failsRené Scharfe2014-10-281-2/+2
* | | | | | | | | | Merge branch 'jk/prune-mtime'Junio C Hamano2014-10-297-199/+157
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pack-objects: double-check options before discarding objectsJeff King2014-10-191-0/+2
| * | | | | | | | | | repack: pack objects mentioned by the indexJeff King2014-10-192-0/+9
| * | | | | | | | | | pack-objects: use argv_arrayJeff King2014-10-191-10/+10
| * | | | | | | | | | make add_object_array_with_context interface more saneJeff King2014-10-161-4/+4
| * | | | | | | | | | pack-objects: match prune logic for discarding objectsJeff King2014-10-161-0/+39
| * | | | | | | | | | pack-objects: refactor unpack-unreachable expiration checkJeff King2014-10-161-5/+12
| * | | | | | | | | | prune: keep objects reachable from recent objectsJeff King2014-10-162-2/+2
| * | | | | | | | | | count-objects: use for_each_loose_file_in_objdirJeff King2014-10-161-71/+30
| * | | | | | | | | | count-objects: do not use xsize_t when counting object sizeJeff King2014-10-161-1/+1
| * | | | | | | | | | prune-packed: use for_each_loose_file_in_objdirJeff King2014-10-161-46/+23
| * | | | | | | | | | prune: factor out loose-object directory traversalJeff King2014-10-161-61/+26
* | | | | | | | | | | Merge branch 'jc/push-cert'Junio C Hamano2014-10-241-1/+12
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | push: heed user.signingkey for signed pushesMichael J Gruber2014-10-241-1/+12
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'eb/no-pthreads'Junio C Hamano2014-10-243-7/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Handle atexit list internaly for unthreaded buildseb/no-pthreadsEtienne Buira2014-10-191-5/+0
| * | | | | | | | | | pack-objects: set number of threads before checking and warningJunio C Hamano2014-10-131-2/+4