summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/deflate-init-cleanup'Junio C Hamano2015-03-172-3/+0
|\
| * zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}rs/deflate-init-cleanupRené Scharfe2015-03-052-3/+0
* | Merge branch 'mh/expire-updateref-fixes'Junio C Hamano2015-03-101-6/+3
|\ \
| * | reflog: improve and update documentationMichael Haggerty2015-03-051-6/+3
| * | Merge branch 'sb/atomic-push' into mh/ref-trans-value-checkJunio C Hamano2015-02-093-36/+140
| |\ \
| * \ \ Merge branch 'mh/reflog-expire' into mh/ref-trans-value-checkJunio C Hamano2015-02-091-156/+103
| |\ \ \
* | \ \ \ Merge branch 'ja/clean-confirm-i18n'Junio C Hamano2015-03-061-1/+2
|\ \ \ \ \
| * | | | | Add hint interactive cleaningja/clean-confirm-i18nJean-Noel Avila2015-03-021-1/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'nd/grep-exclude-standard-help-fix'Junio C Hamano2015-03-061-1/+1
|\ \ \ \ \
| * | | | | grep: correct help string for --exclude-standardnd/grep-exclude-standard-help-fixNguyễn Thái Ngọc Duy2015-02-271-1/+1
| |/ / / /
* | | | | Merge branch 'rs/simple-cleanups'Junio C Hamano2015-03-051-4/+3
|\ \ \ \ \
| * | | | | for-each-ref: use skip_prefix() to avoid duplicate string comparisonRené Scharfe2015-02-221-4/+3
* | | | | | Merge branch 'mh/refs-have-new'Junio C Hamano2015-03-056-19/+20
|\ \ \ \ \ \
| * | | | | | ref_transaction_verify(): new function to check a reference's valueMichael Haggerty2015-02-171-5/+2
| * | | | | | commit: avoid race when creating orphan commitsMichael Haggerty2015-02-171-1/+1
| * | | | | | ref_transaction_delete(): remove "have_old" parameterMichael Haggerty2015-02-172-4/+4
| * | | | | | ref_transaction_update(): remove "have_old" parameterMichael Haggerty2015-02-176-9/+12
| * | | | | | refs.c: change some "flags" to "unsigned int"Michael Haggerty2015-02-171-1/+2
* | | | | | | Merge branch 'jc/apply-ws-fix-expands-report'Junio C Hamano2015-03-031-0/+3
|\ \ \ \ \ \ \
| * | | | | | | apply: detect and mark whitespace errors in context lines when fixingjc/apply-ws-fix-expands-reportJunio C Hamano2015-01-221-0/+3
* | | | | | | | Merge branch 'jc/apply-beyond-symlink'Junio C Hamano2015-03-031-1/+141
|\ \ \ \ \ \ \ \
| * | | | | | | | apply: do not touch a file beyond a symbolic linkjc/apply-beyond-symlinkJunio C Hamano2015-02-101-0/+112
| * | | | | | | | apply: do not read from beyond a symbolic linkJunio C Hamano2015-02-101-0/+2
| * | | | | | | | apply: do not read from the filesystem under --indexJunio C Hamano2015-02-101-1/+1
| * | | | | | | | apply: reject input that touches outside the working areaJunio C Hamano2015-02-101-0/+26
* | | | | | | | | Merge branch 'dp/remove-duplicated-header-inclusion'Junio C Hamano2015-02-251-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | do not include the same header twicedp/remove-duplicated-header-inclusionДилян Палаузов2015-02-131-1/+0
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ab/merge-file-prefix'Junio C Hamano2015-02-221-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge-file: correctly open files when in a subdirab/merge-file-prefixAleksander Boruch-Gruszecki2015-02-111-1/+2
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'es/blame-commit-info-fix'Junio C Hamano2015-02-221-3/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | builtin/blame: destroy initialized commit_info onlyes/blame-commit-info-fixEric Sunshine2015-02-101-3/+2
| |/ / / / / / / /
* | | | | | | | | Merge branch 'mg/commit-author-no-match-malformed-message'Junio C Hamano2015-02-171-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit: reword --author error messagemg/commit-author-no-match-malformed-messageMichael J Gruber2015-01-261-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/apply-ws-fix-expands'Junio C Hamano2015-02-171-3/+28
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | / / / / | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | apply: count the size of postimage correctlyjc/apply-ws-fix-expandsJunio C Hamano2015-01-221-2/+21
| * | | | | | | apply: make update_pre_post_images() sanity check the given postlenJunio C Hamano2015-01-221-0/+6
| * | | | | | | apply.c: typofixJunio C Hamano2015-01-221-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'ah/usage-strings'Junio C Hamano2015-02-1158-96/+96
|\ \ \ \ \ \ \
| * | | | | | | standardize usage info string formatAlex Henrie2015-01-1458-97/+97
* | | | | | | | Merge branch 'jc/push-to-checkout'Junio C Hamano2015-02-111-25/+45
|\ \ \ \ \ \ \ \
| * | | | | | | | receive-pack: support push-to-checkout hookjc/push-to-checkoutJunio C Hamano2015-01-081-1/+18
| * | | | | | | | receive-pack: refactor updateInstead codepathJunio C Hamano2014-12-011-25/+28
* | | | | | | | | 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
View Lorry Controller Status