summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/diff-format-doc'Junio C Hamano2015-02-171-1/+2
|\
| * diff-format doc: a score can follow M for rewritejc/diff-format-docJunio C Hamano2015-01-281-1/+2
* | Merge branch 'jk/dumb-http-idx-fetch-fix'Junio C Hamano2015-02-172-1/+19
|\ \
| * | dumb-http: do not pass NULL path to parse_pack_indexjk/dumb-http-idx-fetch-fixJeff King2015-01-272-1/+19
* | | 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/doc-log-rev-list-options'Junio C Hamano2015-02-171-5/+7
|\ \ \
| * | | Documentation: what does "git log --indexed-objects" even mean?jc/doc-log-rev-list-optionsJunio C Hamano2015-01-231-5/+7
* | | | Merge branch 'jc/apply-ws-fix-expands'Junio C Hamano2015-02-172-3/+149
|\ \ \ \
| * | | | 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-222-0/+127
| * | | | apply.c: typofixJunio C Hamano2015-01-221-1/+1
| | |/ / | |/| |
* | | | Merge branch 'ak/add-i-empty-candidates'Junio C Hamano2015-02-171-0/+5
|\ \ \ \
| * | | | add -i: return from list_and_choose if there is no candidateak/add-i-empty-candidatesAlexander Kuleshov2015-01-221-0/+5
| |/ / /
* | | | Merge branch 'ks/rebase-i-abbrev'Junio C Hamano2015-02-172-9/+15
|\ \ \ \
| * | | | rebase -i: use full object name internally throughout the scriptks/rebase-i-abbrevKirill A. Shutemov2015-01-222-9/+15
* | | | | Merge branch 'mh/deref-symref-over-helper-transport'Junio C Hamano2015-02-173-6/+39
|\ \ \ \ \
| * | | | | transport-helper: do not request symbolic refs to remote helpersmh/deref-symref-over-helper-transportMike Hommey2015-01-213-6/+39
* | | | | | 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