summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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
2018-05-08merge-recursive: improve add_cacheinfo error handlingLibravatar Elijah Newren2-9/+11
2018-05-08merge-recursive: avoid spurious rename/rename conflict from dir renamesLibravatar Elijah Newren2-32/+27
2018-05-08directory rename detection: new testcases showcasing a pair of bugsLibravatar Elijah Newren1-0/+296
2018-05-08merge-recursive: fix remaining directory rename + dirty overwrite casesLibravatar Elijah Newren2-7/+26
2018-05-08merge-recursive: fix overwriting dirty files involved in renamesLibravatar Elijah Newren7-24/+77
2018-05-08merge-recursive: avoid clobbering untracked files with directory renamesLibravatar Elijah Newren2-5/+43
2018-05-08merge-recursive: apply necessary modifications for directory renamesLibravatar Elijah Newren2-26/+211
2018-05-08merge-recursive: when comparing files, don't include treesLibravatar Elijah Newren1-6/+21
2018-05-08merge-recursive: check for file level conflicts then get new nameLibravatar Elijah Newren4-9/+199
2018-05-08merge-recursive: add computation of collisions due to dir rename & mergingLibravatar Elijah Newren2-3/+150
2018-05-08merge-recursive: check for directory level conflictsLibravatar Elijah Newren1-0/+119
2018-05-08merge-recursive: add get_directory_renames()Libravatar Elijah Newren2-3/+239
2018-05-08The fifth batch for 2.18Libravatar Junio C Hamano1-0/+112
2018-05-08Merge branch 'ma/http-walker-no-partial'Libravatar Junio C Hamano6-40/+24
2018-05-08Merge branch 'js/runtime-prefix'Libravatar Junio C Hamano4-9/+17
2018-05-08Merge branch 'js/colored-push-errors'Libravatar Junio C Hamano8-15/+211
2018-05-08Merge branch 'jc/parseopt-expiry-errors'Libravatar Junio C Hamano3-2/+20
2018-05-08Merge branch 'ma/fast-export-skip-merge-fix'Libravatar Junio C Hamano2-1/+22
2018-05-08Merge branch 'tz/doc-git-urls-reference'Libravatar Junio C Hamano1-1/+1
2018-05-08Merge branch 'tg/demote-stash-save-in-completion'Libravatar Junio C Hamano1-2/+10
2018-05-08Merge branch 'sa/send-email-dedup-some-headers'Libravatar Junio C Hamano1-1/+6
2018-05-08Merge branch 'nd/submodule-status-fix'Libravatar Junio C Hamano1-2/+6
2018-05-08Merge branch 'js/ident-date-fix'Libravatar Junio C Hamano1-0/+2
2018-05-08Merge branch 'bt/gpg-interface'Libravatar Junio C Hamano3-34/+71
2018-05-08Merge branch 'hn/sort-ls-remote'Libravatar Junio C Hamano3-11/+89
2018-05-08Merge branch 'ab/git-svn-get-record-typofix'Libravatar Junio C Hamano1-1/+1
2018-05-08Merge branch 'tb/config-default'Libravatar Junio C Hamano6-0/+127
2018-05-08Merge branch 'tb/config-type'Libravatar Junio C Hamano3-60/+180
2018-05-08Merge branch 'sg/doc-gc-quote-mismatch-fix'Libravatar Junio C Hamano1-1/+1
2018-05-08Merge branch 'sg/completion-clear-cached'Libravatar Junio C Hamano1-1/+5
2018-05-08Merge branch 'sb/worktree-remove-opt-force'Libravatar Junio C Hamano2-3/+4
2018-05-08Merge branch 'ma/double-dashes-in-docs'Libravatar Junio C Hamano6-12/+12
2018-05-08Merge branch 'tq/t1510'Libravatar Junio C Hamano1-1/+0
2018-05-08Merge branch 'so/glossary-ancestor'Libravatar Junio C Hamano1-1/+1
2018-05-08Merge branch 'ls/checkout-encoding'Libravatar Junio C Hamano13-5/+737
2018-05-08Merge branch 'ab/nuke-emacs-contrib'Libravatar Junio C Hamano5-2228/+25
2018-05-08Merge branch 'nd/warn-more-for-devs'Libravatar Junio C Hamano4-11/+117
2018-05-08Merge branch 'sb/object-store-replace'Libravatar Junio C Hamano17-150/+134
2018-05-08Merge branch 'ds/commit-graph'Libravatar Junio C Hamano30-21/+1587
2018-05-08Merge branch 'js/empty-config-section-fix'Libravatar Junio C Hamano3-136/+439
2018-05-08Merge branch 'ot/libify-get-ref-atom-value'Libravatar Junio C Hamano3-101/+206
2018-05-08Merge branch 'sb/submodule-move-nested'Libravatar Junio C Hamano15-79/+140
2018-05-08Merge branch 'dj/runtime-prefix'Libravatar Junio C Hamano14-55/+412
2018-05-08Merge branch 'ab/simplify-perl-makefile'Libravatar Junio C Hamano2-2/+6
2018-05-08Merge branch 'bw/protocol-v2'Libravatar Junio C Hamano44-368/+3318
2018-05-08mailmap: update brian m. carlson's email addressLibravatar brian m. carlson1-2/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 16:16:25 +0000