summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* push: allow --follow-tags to be set by config push.followTagsjk/push-configDave Olszewski2015-03-144-1/+21
* cmd_push: pass "flags" pointer to config callbackJeff King2015-02-171-1/+1
* cmd_push: set "atomic" bit directlyJeff King2015-02-171-5/+1
* git_push_config: drop cargo-culted wt_status pointerJeff King2015-02-151-2/+1
* Post 2.3 cycle (batch #1)Junio C Hamano2015-02-111-1/+64
* Merge branch 'ah/usage-strings'Junio C Hamano2015-02-1164-104/+108
|\
| * standardize usage info string formatAlex Henrie2015-01-1464-105/+109
* | Merge branch 'jc/pretty-format-doc'Junio C Hamano2015-02-111-3/+7
|\ \
| * | "log --pretty" documentation: do not forget "tformat:"jc/pretty-format-docJunio C Hamano2015-01-151-3/+7
* | | Merge branch 'jc/unused-symbols'Junio C Hamano2015-02-1116-125/+111
|\ \ \
| * | | shallow.c: make check_shallow_file_for_update() staticJunio C Hamano2015-01-152-2/+1
| * | | remote.c: make clear_cas_option() staticJunio C Hamano2015-01-152-2/+1
| * | | urlmatch.c: make match_urls() staticJunio C Hamano2015-01-152-4/+3
| * | | revision.c: make save_parents() and free_saved_parents() staticJunio C Hamano2015-01-152-59/+59
| * | | line-log.c: make line_log_data_init() staticJunio C Hamano2015-01-152-3/+1
| * | | pack-bitmap.c: make pack_bitmap_filename() staticJunio C Hamano2015-01-152-15/+14
| * | | prompt.c: remove git_getpass() nobody usesJunio C Hamano2015-01-152-6/+0
| * | | http.c: make finish_active_slot() and handle_curl_result() staticJunio C Hamano2015-01-152-34/+32
* | | | Merge branch 'jc/push-to-checkout'Junio C Hamano2015-02-114-26/+143
|\ \ \ \
| * | | | receive-pack: support push-to-checkout hookjc/push-to-checkoutJunio C Hamano2015-01-084-2/+116
| * | | | receive-pack: refactor updateInstead codepathJunio C Hamano2014-12-011-25/+28
* | | | | Merge branch 'sb/atomic-push'Junio C Hamano2015-02-1113-50/+429
|\ \ \ \ \
| * | | | | Document receive.advertiseatomicStefan Beller2015-01-141-0/+5
| * | | | | t5543-atomic-push.sh: add basic tests for atomic pushesStefan Beller2015-01-071-0/+194
| * | | | | push.c: add an --atomic argumentRonnie Sahlberg2015-01-074-1/+13
| * | | | | send-pack.c: add --atomic command line argumentRonnie Sahlberg2015-01-076-6/+66
| * | | | | send-pack: rename ref_update_to_be_sent to check_to_send_updateStefan Beller2015-01-071-7/+11
| * | | | | receive-pack.c: negotiate atomic push supportRonnie Sahlberg2015-01-072-2/+22
| * | | | | receive-pack.c: add execute_commands_atomic functionStefan Beller2015-01-071-1/+46
| * | | | | receive-pack.c: move transaction handling in a central placeStefan Beller2015-01-071-14/+37
| * | | | | receive-pack.c: move iterating over all commands outside execute_commandsStefan Beller2015-01-071-6/+13
| * | | | | receive-pack.c: die instead of error in case of possible future bugStefan Beller2015-01-071-3/+1
| * | | | | receive-pack.c: shorten the execute_commands loop over all commandsStefan Beller2015-01-071-16/+27
* | | | | | Merge branch 'mh/reflog-expire'Junio C Hamano2015-02-113-265/+332
|\ \ \ \ \ \ | |/ / / / /
| * | | | | refs.c: let fprintf handle the formattingmh/reflog-expireStefan Beller2014-12-221-5/+2
| * | | | | refs.c: don't expose the internal struct ref_lock in the header fileStefan Beller2014-12-222-9/+9
| * | | | | lock_any_ref_for_update(): inline functionMichael Haggerty2014-12-222-16/+2
| * | | | | refs.c: remove unlock_ref/close_ref/commit_ref from the refs apiRonnie Sahlberg2014-12-222-21/+12
| * | | | | reflog_expire(): new function in the reference APIMichael Haggerty2014-12-223-133/+190
| * | | | | expire_reflog(): treat the policy callback data as opaqueMichael Haggerty2014-12-121-36/+36
| * | | | | Move newlog and last_kept_sha1 to "struct expire_reflog_cb"Michael Haggerty2014-12-121-10/+10
| * | | | | expire_reflog(): move rewrite to flags argumentMichael Haggerty2014-12-121-5/+5
| * | | | | expire_reflog(): move verbose to flags argumentMichael Haggerty2014-12-121-8/+8
| * | | | | expire_reflog(): pass flags through to expire_reflog_ent()Michael Haggerty2014-12-121-0/+2
| * | | | | struct expire_reflog_cb: a new callback data typeMichael Haggerty2014-12-121-17/+26
| * | | | | Rename expire_reflog_cb to expire_reflog_policy_cbMichael Haggerty2014-12-121-9/+10
| * | | | | expire_reflog(): move updateref to flags argumentMichael Haggerty2014-12-121-6/+6
| * | | | | expire_reflog(): move dry_run to flags argumentMichael Haggerty2014-12-121-5/+8
| * | | | | expire_reflog(): add a "flags" argumentMichael Haggerty2014-12-121-4/+6
| * | | | | expire_reflog(): extract two policy-related functionsMichael Haggerty2014-12-121-42/+52