summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fk/use-kwset-pickaxe-grep-f'Junio C Hamano2011-09-029-34/+1830
|\
| * obstack: Fix portability issuesFredrik Kuivinen2011-08-283-36/+6
| * Use kwset in grepFredrik Kuivinen2011-08-203-23/+49
| * Use kwset in pickaxeFredrik Kuivinen2011-08-202-11/+25
| * Adapt the kwset code to GitFredrik Kuivinen2011-08-202-26/+26
| * Add string search routines from GNU grepFredrik Kuivinen2011-08-202-0/+834
| * Add obstack.[ch] from EGLIBC 2.10Fredrik Kuivinen2011-08-203-0/+952
* | Merge branch 'en/merge-recursive-2'Junio C Hamano2011-09-0210-430/+2170
|\ \
| * | merge-recursive: Don't re-sort a list whose order we depend uponElijah Newren2011-08-141-4/+12
| * | merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-destElijah Newren2011-08-142-3/+22
| * | t6036: criss-cross + rename/rename(1to2)/add-dest + simple modifyElijah Newren2011-08-141-0/+69
| * | merge-recursive: Avoid unnecessary file rewritesElijah Newren2011-08-142-9/+27
| * | t6022: Additional tests checking for unnecessary updates of filesElijah Newren2011-08-141-0/+91
| * | merge-recursive: Fix spurious 'refusing to lose untracked file...' messagesElijah Newren2011-08-142-15/+21
| * | t6022: Add testcase for spurious "refusing to lose untracked" messagesElijah Newren2011-08-141-0/+26
| * | t3030: fix accidental success in symlink renameJeff King2011-08-141-2/+5
| * | merge-recursive: Fix working copy handling for rename/rename/add/addElijah Newren2011-08-142-26/+58
| * | merge-recursive: add handling for rename/rename/add-dest/add-destElijah Newren2011-08-142-3/+20
| * | merge-recursive: Have conflict_rename_delete reuse modify/delete codeElijah Newren2011-08-141-16/+30
| * | merge-recursive: Make modify/delete handling code reusableElijah Newren2011-08-142-36/+50
| * | merge-recursive: Consider modifications in rename/rename(2to1) conflictsElijah Newren2011-08-143-38/+32
| * | merge-recursive: Create function for merging with branchname:file markersElijah Newren2011-08-141-9/+33
| * | merge-recursive: Record more data needed for merging with dual renamesElijah Newren2011-08-141-3/+39
| * | merge-recursive: Defer rename/rename(2to1) handling until process_entryElijah Newren2011-08-141-42/+62
| * | merge-recursive: Small cleanups for conflict_rename_rename_1to2Elijah Newren2011-08-141-33/+27
| * | merge-recursive: Fix rename/rename(1to2) resolution for virtual merge baseElijah Newren2011-08-142-18/+14
| * | merge-recursive: Introduce a merge_file convenience functionElijah Newren2011-08-141-35/+37
| * | merge-recursive: Fix modify/delete resolution in the recursive caseElijah Newren2011-08-142-16/+26
| * | merge-recursive: When we detect we can skip an update, actually skip itElijah Newren2011-08-142-5/+18
| * | merge-recursive: Provide more info in conflict markers with file renamesElijah Newren2011-08-143-8/+97
| * | merge-recursive: Cleanup and consolidation of rename_conflict_infoElijah Newren2011-08-141-68/+66
| * | merge-recursive: Consolidate process_entry() and process_df_entry()Elijah Newren2011-08-141-131/+57
| * | merge-recursive: Improve handling of rename target vs. directory additionElijah Newren2011-08-143-8/+25
| * | merge-recursive: Add comments about handling rename/add-source casesElijah Newren2011-08-141-0/+11
| * | merge-recursive: Make dead code for rename/rename(2to1) conflicts undeadElijah Newren2011-08-142-30/+57
| * | merge-recursive: Fix deletion of untracked file in rename/delete conflictsElijah Newren2011-08-142-2/+3
| * | merge-recursive: Split update_stages_and_entry; only update stages at endElijah Newren2011-08-141-18/+17
| * | merge-recursive: Allow make_room_for_path() to remove D/F entriesElijah Newren2011-08-142-5/+23
| * | string-list: Add API to remove an item from an unsorted listJohannes Sixt2011-08-143-0/+20
| * | merge-recursive: Split was_tracked() out of would_lose_untracked()Elijah Newren2011-08-141-3/+8
| * | merge-recursive: Save D/F conflict filenames instead of unlinking themElijah Newren2011-08-142-16/+25
| * | merge-recursive: Fix code checking for D/F conflicts still being presentElijah Newren2011-08-141-15/+34
| * | merge-recursive: Fix sorting order and directory change assumptionsElijah Newren2011-08-142-13/+53
| * | merge-recursive: Fix recursive case with D/F conflict via add/add conflictElijah Newren2011-08-142-2/+4
| * | merge-recursive: Avoid working directory changes during recursive caseElijah Newren2011-08-141-0/+7
| * | merge-recursive: Remember to free generated unique path namesElijah Newren2011-08-141-8/+12
| * | merge-recursive: Consolidate different update_stages functionsElijah Newren2011-08-141-18/+9
| * | merge-recursive: Mark some diff_filespec struct arguments constElijah Newren2011-08-141-9/+10
| * | merge-recursive: Correct a commentElijah Newren2011-08-141-1/+1
| * | merge-recursive: Make BUG message more legible by adding a newlineElijah Newren2011-08-141-1/+1
View Lorry Controller Status