summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/relative-directory-fix' into pupuJunio C Hamano2018-03-3111-17/+223
|\
| * refs: use chdir_notify to update cached relative pathsjk/relative-directory-fixJeff King2018-03-303-0/+21
| * set_work_tree: use chdir_notifyJeff King2018-03-302-7/+25
| * add chdir-notify APIJeff King2018-03-303-0/+167
| * trace.c: export trace_setup_keyNguyễn Thái Ngọc Duy2018-03-302-7/+8
| * set_git_dir: die when setenv() failsJeff King2018-03-302-4/+3
* | Merge branch 'jk/flockfile-stdio' into puJunio C Hamano2018-03-311-3/+5
|\ \
| * | config: move flockfile() closer to unlocked functionsjk/flockfile-stdioJeff King2018-03-301-3/+5
* | | Merge branch 'nd/pack-objects-pack-struct' into puJunio C Hamano2018-03-3114-164/+587
|\ \ \
| * | | pack-objects: reorder members to shrink struct object_entrynd/pack-objects-pack-structNguyễn Thái Ngọc Duy2018-03-261-8/+10
| * | | pack-objects: shrink delta_size field in struct object_entryNguyễn Thái Ngọc Duy2018-03-262-11/+36
| * | | pack-objects: shrink size field in struct object_entryNguyễn Thái Ngọc Duy2018-03-264-26/+142
| * | | pack-objects: clarify the use of object_entry::sizeNguyễn Thái Ngọc Duy2018-03-262-4/+11
| * | | pack-objects: don't check size when the object is badNguyễn Thái Ngọc Duy2018-03-261-2/+2
| * | | pack-objects: shrink z_delta_size field in struct object_entryNguyễn Thái Ngọc Duy2018-03-263-8/+20
| * | | pack-objects: refer to delta objects by index instead of pointerNguyễn Thái Ngọc Duy2018-03-262-59/+124
| * | | pack-objects: move in_pack out of struct object_entryNguyễn Thái Ngọc Duy2018-03-266-12/+100
| * | | pack-objects: move in_pack_pos out of struct object_entryNguyễn Thái Ngọc Duy2018-03-195-7/+26
| * | | pack-objects: use bitfield for object_entry::depthNguyễn Thái Ngọc Duy2018-03-195-5/+13
| * | | pack-objects: use bitfield for object_entry::dfs_stateNguyễn Thái Ngọc Duy2018-03-192-11/+20
| * | | pack-objects: turn type and in_pack_type to bitfieldsNguyễn Thái Ngọc Duy2018-03-195-31/+58
| * | | pack-objects: a bit of document about struct object_entryNguyễn Thái Ngọc Duy2018-03-191-0/+45
* | | | Merge branch 'ot/libify-get-ref-atom-value' into puJunio C Hamano2018-03-313-101/+206
|\ \ \ \
| * | | | ref-filter: libify get_ref_atom_value()ot/libify-get-ref-atom-valueOlga Telezhnaya2018-03-291-24/+30
| * | | | ref-filter: add return value to parsersOlga Telezhnaya2018-03-291-49/+89
| * | | | ref-filter: change parsing function error handlingOlga Telezhnaya2018-03-291-8/+24
| * | | | ref-filter: add return value && strbuf to handlersOlga Telezhnaya2018-03-291-16/+35
| * | | | ref-filter: start adding strbufs with errorsOlga Telezhnaya2018-03-293-10/+21
| * | | | ref-filter: add shortcut to work with strbufsOlga Telezhnaya2018-03-291-0/+13
* | | | | Merge branch 'js/rebase-recreate-merge' into puJunio C Hamano2018-03-3113-29/+1021
|\ \ \ \ \
| * | | | | rebase -i: introduce --recreate-merges=[no-]rebase-cousinsjs/rebase-recreate-mergeJohannes Schindelin2018-02-237-3/+59
| * | | | | pull: accept --rebase=recreate to recreate the branch topologyJohannes Schindelin2018-02-235-6/+25
| * | | | | sequencer: handle post-rewrite for merge commandsJohannes Schindelin2018-02-232-2/+30
| * | | | | sequencer: make refs generated by the `label` command worktree-localJohannes Schindelin2018-02-232-1/+16
| * | | | | rebase: introduce the --recreate-merges optionJohannes Schindelin2018-02-235-2/+162
| * | | | | rebase-helper --make-script: introduce a flag to recreate mergesJohannes Schindelin2018-02-233-3/+351
| * | | | | sequencer: fast-forward merge commits, if possibleJohannes Schindelin2018-02-231-1/+20
| * | | | | sequencer: introduce the `merge` commandJohannes Schindelin2018-02-232-0/+162
| * | | | | sequencer: introduce new commands to reset the revisionJohannes Schindelin2018-02-232-6/+192
| * | | | | git-rebase--interactive: clarify argumentsStefan Beller2018-02-121-7/+7
| * | | | | sequencer: make rearrange_squash() a bit more obviousJohannes Schindelin2018-02-121-1/+1
| * | | | | sequencer: avoid using errno clobbered by rollback_lock_file()Johannes Schindelin2018-02-121-5/+8
* | | | | | Merge branch 'ls/checkout-encoding' into puJunio C Hamano2018-03-3113-4/+732
|\ \ \ \ \ \
| * | | | | | convert: add round trip check based on 'core.checkRoundtripEncoding'ls/checkout-encodingLars Schneider2018-03-167-0/+137
| * | | | | | convert: add tracing for 'working-tree-encoding' attributeLars Schneider2018-03-162-0/+27
| * | | | | | convert: check for detectable errors in UTF encodingsLars Schneider2018-03-162-0/+123
| * | | | | | convert: add 'working-tree-encoding' attributeLars Schneider2018-03-165-2/+336
| * | | | | | utf8: add function to detect a missing UTF-16/32 BOMLars Schneider2018-03-162-0/+32
| * | | | | | utf8: add function to detect prohibited UTF-16/32 BOMLars Schneider2018-03-162-0/+35
| * | | | | | utf8: teach same_encoding() alternative UTF encoding namesLars Schneider2018-03-161-1/+19
View Lorry Controller Status