summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2011-08-16Merge branch 'js/maint-add-path-stat-pwd' into maintLibravatar Junio C Hamano1-1/+2
2011-08-16Merge branch 'ms/help-unknown' into maintLibravatar Junio C Hamano1-0/+12
2011-08-16Merge branch 'mz/doc-synopsis-verse' into maintLibravatar Junio C Hamano93-6/+92
2011-08-16Merge branch 'jn/mime-type-with-params' into maintLibravatar Junio C Hamano1-1/+10
2011-08-16Merge branch 'jc/submodule-sync-no-auto-vivify' into maintLibravatar Junio C Hamano3-30/+47
2011-08-16Merge branch 'jc/zlib-wrap' into maintLibravatar Junio C Hamano15-124/+321
2011-08-16Merge branch 'fk/relink-upon-ldflags-update' into maintLibravatar Junio C Hamano2-8/+18
2011-08-16Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4' into maintLibravatar Junio C Hamano2-1/+23
2011-08-16Merge branch 'aw/rebase-i-p' into maintLibravatar Junio C Hamano4-5/+30
2011-08-16Merge branch 'jc/diff-index-quick-exit-early' into maintLibravatar Junio C Hamano3-2/+10
2011-08-16Merge branch 'jk/combine-diff-binary-etc' into maintLibravatar Junio C Hamano5-83/+376
2011-08-16am: refresh the index at start and --resolvedLibravatar Jeff King1-0/+2
2011-08-16revert: plug memory leak in "cherry-pick root commit" codepathLibravatar Jonathan Nieder2-7/+27
2011-08-14Unroll the loop over passesLibravatar Michael Haggerty1-25/+26
2011-08-14Change while loop into for loopLibravatar Michael Haggerty1-4/+1
2011-08-14Determine the start of the states outside of the pass loopLibravatar Michael Haggerty1-3/+5
2011-08-14Change parse_attr() to take a pointer to struct attr_stateLibravatar Michael Haggerty1-6/+11
2011-08-14Increment num_attr in parse_attr_line(), not parse_attr()Libravatar Michael Haggerty1-4/+4
2011-08-14Document struct match_attrLibravatar Michael Haggerty1-0/+14
2011-08-14Add a file commentLibravatar Michael Haggerty1-16/+10
2011-08-14fast-import: prevent producing bad deltaLibravatar Dmitry Ivankov2-6/+31
2011-08-14fast-import: add a test for tree delta base corruptionLibravatar Dmitry Ivankov1-0/+41
2011-08-14merge-recursive: Don't re-sort a list whose order we depend uponLibravatar Elijah Newren1-4/+12
2011-08-14merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-destLibravatar Elijah Newren2-3/+22
2011-08-14t6036: criss-cross + rename/rename(1to2)/add-dest + simple modifyLibravatar Elijah Newren1-0/+69
2011-08-14merge-recursive: Avoid unnecessary file rewritesLibravatar Elijah Newren2-9/+27
2011-08-14t6022: Additional tests checking for unnecessary updates of filesLibravatar Elijah Newren1-0/+91
2011-08-14merge-recursive: Fix spurious 'refusing to lose untracked file...' messagesLibravatar Elijah Newren2-15/+21
2011-08-14t6022: Add testcase for spurious "refusing to lose untracked" messagesLibravatar Elijah Newren1-0/+26
2011-08-14t3030: fix accidental success in symlink renameLibravatar Jeff King1-2/+5
2011-08-14merge-recursive: Fix working copy handling for rename/rename/add/addLibravatar Elijah Newren2-26/+58
2011-08-14merge-recursive: add handling for rename/rename/add-dest/add-destLibravatar Elijah Newren2-3/+20
2011-08-14merge-recursive: Have conflict_rename_delete reuse modify/delete codeLibravatar Elijah Newren1-16/+30
2011-08-14merge-recursive: Make modify/delete handling code reusableLibravatar Elijah Newren2-36/+50
2011-08-14merge-recursive: Consider modifications in rename/rename(2to1) conflictsLibravatar Elijah Newren3-38/+32
2011-08-14merge-recursive: Create function for merging with branchname:file markersLibravatar Elijah Newren1-9/+33
2011-08-14merge-recursive: Record more data needed for merging with dual renamesLibravatar Elijah Newren1-3/+39
2011-08-14merge-recursive: Defer rename/rename(2to1) handling until process_entryLibravatar Elijah Newren1-42/+62
2011-08-14merge-recursive: Small cleanups for conflict_rename_rename_1to2Libravatar Elijah Newren1-33/+27
2011-08-14merge-recursive: Fix rename/rename(1to2) resolution for virtual merge baseLibravatar Elijah Newren2-18/+14
2011-08-14merge-recursive: Introduce a merge_file convenience functionLibravatar Elijah Newren1-35/+37
2011-08-14merge-recursive: Fix modify/delete resolution in the recursive caseLibravatar Elijah Newren2-16/+26
2011-08-14merge-recursive: When we detect we can skip an update, actually skip itLibravatar Elijah Newren2-5/+18
2011-08-14merge-recursive: Provide more info in conflict markers with file renamesLibravatar Elijah Newren3-8/+97
2011-08-14merge-recursive: Cleanup and consolidation of rename_conflict_infoLibravatar Elijah Newren1-68/+66
2011-08-14merge-recursive: Consolidate process_entry() and process_df_entry()Libravatar Elijah Newren1-131/+57
2011-08-14merge-recursive: Improve handling of rename target vs. directory additionLibravatar Elijah Newren3-8/+25
2011-08-14merge-recursive: Add comments about handling rename/add-source casesLibravatar Elijah Newren1-0/+11
2011-08-14merge-recursive: Make dead code for rename/rename(2to1) conflicts undeadLibravatar Elijah Newren2-30/+57
2011-08-14merge-recursive: Fix deletion of untracked file in rename/delete conflictsLibravatar Elijah Newren2-2/+3
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-14 21:06:44 +0000