aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jc/apply-ws-fix-expands-report'Junio C Hamano2015-03-03
|\
| * apply: detect and mark whitespace errors in context lines when fixingJunio C Hamano2015-01-22
* | Merge branch 'jc/apply-beyond-symlink'Junio C Hamano2015-03-03
|\ \
| * | apply: do not touch a file beyond a symbolic linkJunio C Hamano2015-02-10
| * | apply: do not read from beyond a symbolic linkJunio C Hamano2015-02-10
| * | apply: do not read from the filesystem under --indexJunio C Hamano2015-02-10
| * | apply: reject input that touches outside the working areaJunio C Hamano2015-02-10
* | | Merge branch 'dp/remove-duplicated-header-inclusion'Junio C Hamano2015-02-25
|\ \ \
| * | | do not include the same header twiceДилян Палаузов2015-02-13
* | | | Merge branch 'ab/merge-file-prefix'Junio C Hamano2015-02-22
|\ \ \ \
| * | | | merge-file: correctly open files when in a subdirAleksander Boruch-Gruszecki2015-02-11
| | |/ / | |/| |
* | | | Merge branch 'es/blame-commit-info-fix'Junio C Hamano2015-02-22
|\ \ \ \
| * | | | builtin/blame: destroy initialized commit_info onlyEric Sunshine2015-02-10
| |/ / /
* | | | Merge branch 'mg/commit-author-no-match-malformed-message'Junio C Hamano2015-02-17
|\ \ \ \
| * | | | commit: reword --author error messageMichael J Gruber2015-01-26
* | | | | Merge branch 'jc/apply-ws-fix-expands'Junio C Hamano2015-02-17
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | apply: count the size of postimage correctlyJunio C Hamano2015-01-22
| * | | | apply: make update_pre_post_images() sanity check the given postlenJunio C Hamano2015-01-22
| * | | | apply.c: typofixJunio C Hamano2015-01-22
| |/ / /
* | | | Merge branch 'ah/usage-strings'Junio C Hamano2015-02-11
|\ \ \ \
| * | | | standardize usage info string formatAlex Henrie2015-01-14
* | | | | Merge branch 'jc/push-to-checkout'Junio C Hamano2015-02-11
|\ \ \ \ \
| * | | | | receive-pack: support push-to-checkout hookJunio C Hamano2015-01-08
| * | | | | receive-pack: refactor updateInstead codepathJunio C Hamano2014-12-01
* | | | | | Merge branch 'sb/atomic-push'Junio C Hamano2015-02-11
|\ \ \ \ \ \
| * | | | | | push.c: add an --atomic argumentRonnie Sahlberg2015-01-07
| * | | | | | send-pack.c: add --atomic command line argumentRonnie Sahlberg2015-01-07
| * | | | | | receive-pack.c: negotiate atomic push supportRonnie Sahlberg2015-01-07
| * | | | | | receive-pack.c: add execute_commands_atomic functionStefan Beller2015-01-07
| * | | | | | receive-pack.c: move transaction handling in a central placeStefan Beller2015-01-07
| * | | | | | receive-pack.c: move iterating over all commands outside execute_commandsStefan Beller2015-01-07
| * | | | | | receive-pack.c: die instead of error in case of possible future bugStefan Beller2015-01-07
| * | | | | | receive-pack.c: shorten the execute_commands loop over all commandsStefan Beller2015-01-07
* | | | | | | Merge branch 'mh/reflog-expire'Junio C Hamano2015-02-11
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | reflog_expire(): new function in the reference APIMichael Haggerty2014-12-22
| * | | | | | expire_reflog(): treat the policy callback data as opaqueMichael Haggerty2014-12-12
| * | | | | | Move newlog and last_kept_sha1 to "struct expire_reflog_cb"Michael Haggerty2014-12-12
| * | | | | | expire_reflog(): move rewrite to flags argumentMichael Haggerty2014-12-12
| * | | | | | expire_reflog(): move verbose to flags argumentMichael Haggerty2014-12-12
| * | | | | | expire_reflog(): pass flags through to expire_reflog_ent()Michael Haggerty2014-12-12
| * | | | | | struct expire_reflog_cb: a new callback data typeMichael Haggerty2014-12-12
| * | | | | | Rename expire_reflog_cb to expire_reflog_policy_cbMichael Haggerty2014-12-12
| * | | | | | expire_reflog(): move updateref to flags argumentMichael Haggerty2014-12-12
| * | | | | | expire_reflog(): move dry_run to flags argumentMichael Haggerty2014-12-12
| * | | | | | expire_reflog(): add a "flags" argumentMichael Haggerty2014-12-12
| * | | | | | expire_reflog(): extract two policy-related functionsMichael Haggerty2014-12-12
| * | | | | | Extract function should_expire_reflog_ent()Michael Haggerty2014-12-12
| * | | | | | expire_reflog(): use a lock_file for rewriting the reflog fileMichael Haggerty2014-12-12
| * | | | | | expire_reflog(): return early if the reference has no reflogMichael Haggerty2014-12-12
| * | | | | | expire_reflog(): rename "ref" parameter to "refname"Michael Haggerty2014-12-12