summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Extract function should_expire_reflog_ent()Michael Haggerty2014-12-121-28/+42
| * expire_reflog(): use a lock_file for rewriting the reflog fileMichael Haggerty2014-12-121-19/+41
| * expire_reflog(): return early if the reference has no reflogMichael Haggerty2014-12-121-3/+5
| * expire_reflog(): rename "ref" parameter to "refname"Michael Haggerty2014-12-121-8/+8
| * expire_reflog(): it's not an each_ref_fn anymoreMichael Haggerty2014-12-121-5/+5
| * refs.c: add a function to append a reflog entry to a fdRonnie Sahlberg2014-12-121-18/+30
| * refs.c: make ref_transaction_delete a wrapper for ref_transaction_updateRonnie Sahlberg2014-12-042-21/+3
| * refs.c: make ref_transaction_create a wrapper for ref_transaction_updateRonnie Sahlberg2014-12-041-25/+2
* | Merge branch 'cj/log-invert-grep'Junio C Hamano2015-02-115-2/+25
|\ \
| * | log: teach --invert-grep optioncj/log-invert-grepChristoph Junghans2015-01-135-2/+25
* | | Merge branch 'km/gettext-n'Junio C Hamano2015-02-113-0/+45
|\ \ \
| * | | gettext.h: add parentheses around N_ expansion if supportedkm/gettext-nKyle J. McKay2015-01-123-0/+45
* | | | Merge branch 'bc/http-fallback-to-password-after-krb-fails'Junio C Hamano2015-02-111-0/+10
|\ \ \ \
| * | | | remote-curl: fall back to Basic auth if Negotiate failsbc/http-fallback-to-password-after-krb-failsbrian m. carlson2015-01-071-0/+10
| |/ / /
* | | | Merge branch 'dk/format-patch-ignore-diff-submodule'Junio C Hamano2015-02-112-1/+73
|\ \ \ \
| * | | | format-patch: ignore diff.submodule settingdk/format-patch-ignore-diff-submoduleDoug Kelly2015-01-072-3/+3
| * | | | t4255: test am submodule with diff.submoduleDoug Kelly2015-01-071-0/+72
| |/ / /
* | | | Merge branch 'jn/rerere-fail-on-auto-update-failure'Junio C Hamano2015-02-111-10/+6
|\ \ \ \
| * | | | rerere: error out on autoupdate failurejn/rerere-fail-on-auto-update-failureJonathan Nieder2015-01-081-10/+6
* | | | | Merge branch 'jk/blame-commit-label'Junio C Hamano2015-02-1111-34/+29
|\ \ \ \ \
| * | | | | blame.c: fix garbled error messagejk/blame-commit-labelLukas Fleischer2015-01-131-5/+7
View Lorry Controller Status