summaryrefslogtreecommitdiffstats
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/atomic-push'Junio C Hamano2015-02-113-36/+140
|\
| * push.c: add an --atomic argumentRonnie Sahlberg2015-01-071-0/+5
| * send-pack.c: add --atomic command line argumentRonnie Sahlberg2015-01-071-1/+5
| * receive-pack.c: negotiate atomic push supportRonnie Sahlberg2015-01-071-0/+11
| * 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-111-156/+103
|\|
| * reflog_expire(): new function in the reference APIMichael Haggerty2014-12-221-133/+15
| * 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
* | Merge branch 'dk/format-patch-ignore-diff-submodule'Junio C Hamano2015-02-111-1/+1
|\ \
| * | format-patch: ignore diff.submodule settingDoug Kelly2015-01-071-1/+1
* | | Merge branch 'jk/blame-commit-label'Junio C Hamano2015-02-113-24/+15
|\ \ \
| * | | blame.c: fix garbled error messageLukas Fleischer2015-01-131-5/+7
| * | | builtin/commit.c: use xstrdup_or_null instead of envdupJeff King2015-01-131-9/+3
| * | | builtin/apply.c: use xstrdup_or_null instead of null_strdupJeff King2015-01-131-10/+5
* | | | Merge branch 'ak/cat-file-clean-up'Junio C Hamano2015-01-221-2/+0
|\ \ \ \
| * | | | cat-file: use "type" and "size" from outer scopeAlexander Kuleshov2015-01-131-2/+0
| * | | | Merge branch 'mg/add-ignore-errors' into maintJunio C Hamano2015-01-121-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | Merge branch 'ak/show-branch-usage-string'Junio C Hamano2015-01-201-3/+3
|\ \ \ \ \
| * | | | | show-branch: fix indentation of usage stringRalf Thielow2015-01-201-3/+3
* | | | | | Merge branch 'rc/for-each-ref-tracking'Junio C Hamano2015-01-141-2/+9
|\ \ \ \ \ \
| * | | | | | for-each-ref: always check stat_tracking_info()'s return valueRaphael Kubo da Costa2015-01-121-2/+9
* | | | | | | Merge branch 'ak/fewer-includes'Junio C Hamano2015-01-141-4/+0
|\ \ \ \ \ \ \
| * | | | | | | cat-file: remove unused includesAlexander Kuleshov2015-01-091-4/+0
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'ak/show-branch-usage-string'Junio C Hamano2015-01-141-1/+4
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | show-branch: line-wrap show-branch usageAlexander Kuleshov2015-01-081-1/+4
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'km/log-usage-string-i18n'Junio C Hamano2015-01-141-2/+2
|\ \ \ \ \ \
| * | | | | | log.c: fix translation markingsKyle J. McKay2015-01-061-2/+2
| |/ / / / /
* | | | | | Merge branch 'js/remote-add-with-insteadof'Junio C Hamano2015-01-141-1/+3
|\ \ \ \ \ \
| * | | | | | git remote: allow adding remotes agreeing with url.<...>.insteadOfJohannes Schindelin2014-12-231-1/+3
* | | | | | | Merge branch 'bc/fetch-thin-less-aggressive-in-normal-repository'Junio C Hamano2015-01-121-1/+6
|\ \ \ \ \ \ \
| * | | | | | | pack-objects: use --objects-edge-aggressive for shallow reposbrian m. carlson2014-12-291-1/+6
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-24 07:56:16 +0000