summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2018-05-23Merge branch 'en/unpack-trees-split-index-fix'Libravatar Junio C Hamano1-4/+15
2018-05-23Merge branch 'nd/doc-header'Libravatar Junio C Hamano38-96/+96
2018-05-23Merge branch 'bc/format-patch-cover-no-attach'Libravatar Junio C Hamano4-5/+16
2018-05-23Merge branch 'tb/test-apfs-utf8-normalization'Libravatar Junio C Hamano1-6/+1
2018-05-23Merge branch 'js/rebase-recreate-merge'Libravatar Junio C Hamano14-59/+1352
2018-05-23Merge branch 'nd/pack-objects-pack-struct'Libravatar Junio C Hamano16-167/+656
2018-05-23Merge branch 'en/rename-directory-detection-reboot'Libravatar Junio C Hamano11-178/+6092
2018-05-23Merge branch 'js/no-pager-shorthand'Libravatar Junio C Hamano2-3/+4
2018-05-23Merge branch 'js/rebase-i-clean-msg-after-fixup-continue'Libravatar Junio C Hamano3-48/+200
2018-05-23Merge branch 'tg/worktree-add-existing-branch'Libravatar Junio C Hamano3-36/+100
2018-05-23Merge branch 'js/deprecate-grafts'Libravatar Junio C Hamano14-118/+274
2018-05-23Merge branch 'js/test-unset-prereq'Libravatar Junio C Hamano1-1/+13
2018-05-23Merge branch 'ab/perl-python-attrs'Libravatar Junio C Hamano1-2/+4
2018-05-23Merge branch 'sb/oid-object-info'Libravatar Junio C Hamano36-94/+125
2018-05-23Merge branch 'cc/perf-aggregate-unknown-option'Libravatar Junio C Hamano1-36/+26
2018-05-23Merge branch 'en/git-debugger'Libravatar Junio C Hamano2-10/+33
2018-05-23Merge branch 'bw/server-options'Libravatar Junio C Hamano14-3/+116
2018-05-23Merge branch 'nd/repack-keep-pack'Libravatar Junio C Hamano13-36/+349
2018-05-23Merge branch 'ds/lazy-load-trees'Libravatar Junio C Hamano26-66/+152
2018-05-23Merge branch 'nd/term-columns'Libravatar Junio C Hamano3-5/+9
2018-05-23Merge branch 'sg/t7005-spaces-in-filenames-cleanup'Libravatar Junio C Hamano1-9/+3
2018-05-23Merge branch 'sg/t5516-fixes'Libravatar Junio C Hamano1-5/+5
2018-05-23Merge branch 'sg/t5310-jgit-bitmap-test'Libravatar Junio C Hamano1-4/+4
2018-05-23Merge branch 'nd/pack-format-doc'Libravatar Junio C Hamano2-0/+97
2018-05-23Merge branch 'jk/apply-p-doc'Libravatar Junio C Hamano1-2/+4
2018-05-23Merge branch 'ao/config-api-doc'Libravatar Junio C Hamano1-8/+10
2018-05-23Merge branch 'bc/mailmap-self'Libravatar Junio C Hamano1-2/+2
2018-05-23Merge branch 'sb/object-store-replace'Libravatar Junio C Hamano3-1/+7
2018-05-23Merge branch 'hn/sort-ls-remote'Libravatar Junio C Hamano1-1/+1
2018-05-21get_main_ref_store: BUG() when outside a repositoryLibravatar Jeff King1-0/+3
2018-05-18object.c: clear replace map before freeing itLibravatar Stefan Beller1-0/+2
2018-05-15t7005-editor: get rid of the SPACES_IN_FILENAMES prereqLibravatar SZEDER Gábor1-9/+3
2018-05-14t5512: run git fetch inside testLibravatar René Scharfe1-1/+1
2018-05-13column: fix off-by-one default widthLibravatar Nguyễn Thái Ngọc Duy2-2/+1
2018-05-13pager: set COLUMNS to term_columns()Libravatar Jeff King1-3/+8
2018-05-13pack-format.txt: more details on pack file formatLibravatar Nguyễn Thái Ngọc Duy2-0/+97
2018-05-11apply: clarify "-p" documentationLibravatar Jeff King1-2/+4
2018-05-11t5516-fetch-push: fix broken &&-chainLibravatar SZEDER Gábor1-1/+1
2018-05-11t5516-fetch-push: fix 'push with dry-run' testLibravatar SZEDER Gábor1-4/+4
2018-05-11t5310-pack-bitmaps: make JGit tests work with GIT_TEST_SPLIT_INDEXLibravatar SZEDER Gábor1-4/+4
2018-05-11doc: fix config API documentation about config_with_optionsLibravatar Antonio Ospite1-8/+10
2018-05-10replace-object.c: remove the_repository from prepare_replace_objectLibravatar Stefan Beller1-1/+1
2018-05-10object.c: free replace map in raw_object_store_clearLibravatar Stefan Beller1-0/+1
2018-05-08merge-recursive: fix check for skipability of working tree updatesLibravatar Elijah Newren4-23/+39
2018-05-08merge-recursive: make "Auto-merging" comment show for other mergesLibravatar Elijah Newren1-26/+39
2018-05-08merge-recursive: fix remainder of was_dirty() to use original indexLibravatar Elijah Newren1-3/+3
2018-05-08merge-recursive: fix was_tracked() to quit lying with some renamed pathsLibravatar Elijah Newren2-24/+68
2018-05-08t6046: testcases checking whether updates can be skipped in a mergeLibravatar Elijah Newren1-0/+761
2018-05-08merge-recursive: avoid triggering add_cacheinfo error with dirty modLibravatar Elijah Newren2-2/+2
2018-05-08merge-recursive: move more is_dirty handling to merge_contentLibravatar Elijah Newren1-18/+12