summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | fetch.c: change s_update_ref to use a ref transactionRonnie Sahlberg2014-10-151-10/+24
| * | | | | refs.c: pass the ref log message to _create/delete/update instead of _commitRonnie Sahlberg2014-10-155-14/+17
* | | | | | Merge branch 'cc/interpret-trailers'Junio C Hamano2014-10-201-0/+44
|\ \ \ \ \ \
| * | | | | | trailer: add interpret-trailers commandChristian Couder2014-10-131-0/+44
* | | | | | | Merge branch 'jn/parse-config-slot'Junio C Hamano2014-10-206-30/+31
|\ \ \ \ \ \ \
| * | | | | | | color_parse: do not mention variable name in error messagejn/parse-config-slotJeff King2014-10-145-11/+13
| * | | | | | | pass config slots as pointers instead of offsetsJonathan Nieder2014-10-143-19/+18
| * | | | | | | Merge branch 'jk/fsck-exit-code-fix' into maintJunio C Hamano2014-09-291-2/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ta/config-add-to-empty-or-true-fix' into maintJunio C Hamano2014-09-291-1/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/index-pack-threading-races' into maintJunio C Hamano2014-09-291-2/+31
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/send-pack-many-refspecs' into maintJunio C Hamano2014-09-291-0/+27
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/fetch-pass-quiet-to-gc-child-process' into maintJunio C Hamano2014-09-191-4/+6
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/apply-ws-prefix' into maintJunio C Hamano2014-09-191-63/+68
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/receive-pack-argv-leak-fix'Junio C Hamano2014-10-201-10/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | receive-pack: plug minor memory leak in unpack()rs/receive-pack-argv-leak-fixRené Scharfe2014-10-131-10/+8
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'po/everyday-doc'Junio C Hamano2014-10-161-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | doc: add 'everyday' to 'git help'Philip Oakley2014-10-101-0/+1
* | | | | | | | | | | | | Merge branch 'rs/more-uses-of-skip-prefix'Junio C Hamano2014-10-149-45/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | use skip_prefix() to avoid more magic numbersrs/more-uses-of-skip-prefixRené Scharfe2014-10-079-45/+43
* | | | | | | | | | | | | | Merge branch 'rs/mailsplit'Junio C Hamano2014-10-141-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | mailsplit: remove unnecessary unlink(2) callrs/mailsplitRené Scharfe2014-10-071-1/+0
* | | | | | | | | | | | | | | Merge branch 'mh/lockfile'Junio C Hamano2014-10-1417-24/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | lockfile.h: extract new header file for the functions in lockfile.cmh/lockfileMichael Haggerty2014-10-0117-6/+17
| * | | | | | | | | | | | | | lockfile: change lock_file::filename into a strbufMichael Haggerty2014-10-012-7/+7
| * | | | | | | | | | | | | | try_merge_strategy(): use a statically-allocated lock_file objectMichael Haggerty2014-10-011-7/+7
| * | | | | | | | | | | | | | try_merge_strategy(): remove redundant lock_file allocationMichael Haggerty2014-10-011-1/+0
| * | | | | | | | | | | | | | prepare_index(): declare return value to be (const char *)Michael Haggerty2014-10-011-2/+2
| * | | | | | | | | | | | | | unable_to_lock_die(): rename function from unable_to_lock_index_die()Michael Haggerty2014-10-011-1/+1
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jc/push-cert'Junio C Hamano2014-10-083-40/+358
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | receive-pack::hmac_sha1(): copy the entire SHA-1 hash outBrian Gernhardt2014-09-251-2/+2
| * | | | | | | | | | | | signed push: allow stale nonce in stateless modeJunio C Hamano2014-09-171-10/+79
| * | | | | | | | | | | | signed push: teach smart-HTTP to pass "git push --signed" aroundJunio C Hamano2014-09-171-0/+4
| * | | | | | | | | | | | signed push: fortify against replay attacksJunio C Hamano2014-09-171-8/+124
View Lorry Controller Status