summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* show-branch: use a strbuf for reflog descriptionsJeff King2015-09-041-2/+4
* Merge branch 'mg/add-ignore-errors' into maintJunio C Hamano2015-01-121-1/+1
|\
| * add: ignore only ignored filesmg/add-ignore-errorsMichael J Gruber2014-11-211-1/+1
* | Merge branch 'jk/push-simple' into maintJunio C Hamano2014-12-221-4/+4
|\ \
| * | push: truly use "simple" as default, not "upstream"jk/push-simpleJeff King2014-11-301-4/+4
* | | Merge branch 'mh/config-flip-xbit-back-after-checking' into maintJunio C Hamano2014-12-221-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' into maintJunio C Hamano2014-12-221-1/+1
|\ \ \ \
| * | | | use labs() for variables of type long instead of abs()rs/receive-pack-use-labsRené Scharfe2014-11-171-1/+1
* | | | | Merge branch 'jk/colors-fix' into maintJunio C Hamano2014-12-221-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 'jk/checkout-from-tree' into maintJunio C Hamano2014-12-221-0/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | checkout $tree: do not throw away unchanged index entriesjk/checkout-from-treeJeff King2014-11-131-0/+18
* | | | | | | | | | clean: typofixAlexander Kuleshov2014-12-221-1/+1
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | 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
| * | | | | | | | | | index-pack: fix compilation with NO_PTHREADSEtienne Buira2014-10-131-0/+3
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rs/run-command-env-array'Junio C Hamano2014-10-241-9/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | use env_array member of struct child_processrs/run-command-env-arrayRené Scharfe2014-10-191-9/+14
* | | | | | | | | | | Merge branch 'jk/pack-objects-no-bitmap-when-splitting'Junio C Hamano2014-10-241-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | pack-objects: turn off bitmaps when we split packsjk/pack-objects-no-bitmap-when-splittingJeff King2014-10-191-0/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rs/ref-transaction'Junio C Hamano2014-10-2119-57/+97
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | remote rm/prune: print a message when writing packed-refs failsRonnie Sahlberg2014-10-151-4/+11
| * | | | | | | | | | for-each-ref: skip and warn about broken ref namesRonnie Sahlberg2014-10-151-0/+5
| * | | | | | | | | | refs.c: allow listing and deleting badly named refsRonnie Sahlberg2014-10-151-4/+5
| * | | | | | | | | | branch -d: simplify by using RESOLVE_REF_READINGRonnie Sahlberg2014-10-151-3/+4
| * | | | | | | | | | branch -d: avoid repeated symref resolutionJonathan Nieder2014-10-151-1/+2
| * | | | | | | | | | refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg2014-10-1515-24/+32
View Lorry Controller Status