Commits

Branch selector

 master

User selector

newren

Datepicker

All time

Commit History

Commits on Aug 14, 2011

• merge-recursive: Don't re-sort a list whose order we depend upon

  Show description for f701aae
  

  newren

  authored and

  gitster

  committed
  f701aae

  Copy full SHA for f701aae

• merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest

  Show description for 6d63070
  

  newren

  authored and

  gitster

  committed
  6d63070

  Copy full SHA for 6d63070

• t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify

  Show description for b630b81
  

  newren

  authored and

  gitster

  committed
  b630b81

  Copy full SHA for b630b81

• merge-recursive: Avoid unnecessary file rewrites

  Show description for 35a74ab
  

  newren

  authored and

  gitster

  committed
  35a74ab

  Copy full SHA for 35a74ab

• t6022: Additional tests checking for unnecessary updates of files

  Show description for 3e333a6
  

  newren

  authored and

  gitster

  committed
  3e333a6

  Copy full SHA for 3e333a6

• merge-recursive: Fix spurious 'refusing to lose untracked file...' messages

  Show description for f53d397
  

  newren

  authored and

  gitster

  committed
  f53d397

  Copy full SHA for f53d397

• t6022: Add testcase for spurious "refusing to lose untracked" messages

  Show description for 3f680ff
  

  newren

  authored and

  gitster

  committed
  3f680ff

  Copy full SHA for 3f680ff

• merge-recursive: Fix working copy handling for rename/rename/add/add

  Show description for 3672c97
  

  newren

  authored and

  gitster

  committed
  3672c97

  Copy full SHA for 3672c97

• merge-recursive: add handling for rename/rename/add-dest/add-dest

  Show description for 1ac91b3
  

  newren

  authored and

  gitster

  committed
  1ac91b3

  Copy full SHA for 1ac91b3

• merge-recursive: Have conflict_rename_delete reuse modify/delete code

  Show description for e03acb8
  

  newren

  authored and

  gitster

  committed
  e03acb8

  Copy full SHA for e03acb8

• merge-recursive: Make modify/delete handling code reusable

  Show description for b703325
  

  newren

  authored and

  gitster

  committed
  b703325

  Copy full SHA for b703325

• merge-recursive: Consider modifications in rename/rename(2to1) conflicts

  Show description for 434b852
  

  newren

  authored and

  gitster

  committed
  434b852

  Copy full SHA for 434b852

• merge-recursive: Create function for merging with branchname:file markers

  Show description for dac4741
  

  newren

  authored and

  gitster

  committed
  dac4741

  Copy full SHA for dac4741

• merge-recursive: Record more data needed for merging with dual renames

  Show description for 232c635
  

  newren

  authored and

  gitster

  committed
  232c635

  Copy full SHA for 232c635

• merge-recursive: Defer rename/rename(2to1) handling until process_entry

  Show description for 461f504
  

  newren

  authored and

  gitster

  committed
  461f504

  Copy full SHA for 461f504

• merge-recursive: Small cleanups for conflict_rename_rename_1to2

  Show description for a99b7f2
  

  newren

  authored and

  gitster

  committed
  a99b7f2

  Copy full SHA for a99b7f2

• merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base

  Show description for c52ff85
  

  newren

  authored and

  gitster

  committed
  c52ff85

  Copy full SHA for c52ff85

• merge-recursive: Introduce a merge_file convenience function

  Show description for 6bdaead
  

  newren

  authored and

  gitster

  committed
  6bdaead

  Copy full SHA for 6bdaead

• merge-recursive: Fix modify/delete resolution in the recursive case

  Show description for ec61d14
  

  newren

  authored and

  gitster

  committed
  ec61d14

  Copy full SHA for ec61d14

• merge-recursive: When we detect we can skip an update, actually skip it

  Show description for 5b448b8
  

  newren

  authored and

  gitster

  committed
  5b448b8

  Copy full SHA for 5b448b8

• merge-recursive: Provide more info in conflict markers with file renames

  Show description for 3c217c0
  

  newren

  authored and

  gitster

  committed
  3c217c0

  Copy full SHA for 3c217c0

• merge-recursive: Cleanup and consolidation of rename_conflict_info

  Show description for 4f66dad
  

  newren

  authored and

  gitster

  committed
  4f66dad

  Copy full SHA for 4f66dad

• merge-recursive: Consolidate process_entry() and process_df_entry()

  Show description for edd2faf
  

  newren

  authored and

  gitster

  committed
  edd2faf

  Copy full SHA for edd2faf

• merge-recursive: Improve handling of rename target vs. directory addition

  Show description for 51931bf
  

  newren

  authored and

  gitster

  committed
  51931bf

  Copy full SHA for 51931bf

• merge-recursive: Add comments about handling rename/add-source cases

  Show description for 7769a75
  

  newren

  authored and

  gitster

  committed
  7769a75

  Copy full SHA for 7769a75

• merge-recursive: Make dead code for rename/rename(2to1) conflicts undead

  Show description for 0a6b871
  

  newren

  authored and

  gitster

  committed
  0a6b871

  Copy full SHA for 0a6b871

• merge-recursive: Fix deletion of untracked file in rename/delete conflicts

  Show description for 531357a
  

  newren

  authored and

  gitster

  committed
  531357a

  Copy full SHA for 531357a

• merge-recursive: Split update_stages_and_entry; only update stages at end

  Show description for b8ddf16
  

  newren

  authored and

  gitster

  committed
  b8ddf16

  Copy full SHA for b8ddf16

• merge-recursive: Allow make_room_for_path() to remove D/F entries

  Show description for ed0148a
  

  newren

  authored and

  gitster

  committed
  ed0148a

  Copy full SHA for ed0148a

• merge-recursive: Split was_tracked() out of would_lose_untracked()

  Show description for aacb82d
  

  newren

  authored and

  gitster

  committed
  aacb82d

  Copy full SHA for aacb82d

• merge-recursive: Save D/F conflict filenames instead of unlinking them

  Show description for 70cc3d3
  

  newren

  authored and

  gitster

  committed
  70cc3d3

  Copy full SHA for 70cc3d3

• merge-recursive: Fix code checking for D/F conflicts still being present

  Show description for f2507b4
  

  newren

  authored and

  gitster

  committed
  f2507b4

  Copy full SHA for f2507b4

• merge-recursive: Fix sorting order and directory change assumptions

  Show description for f0fd4d0
  

  newren

  authored and

  gitster

  committed
  f0fd4d0

  Copy full SHA for f0fd4d0

• merge-recursive: Fix recursive case with D/F conflict via add/add conflict

  Show description for 7b1c610
  

  newren

  authored and

  gitster

  committed
  7b1c610

  Copy full SHA for 7b1c610

• merge-recursive: Avoid working directory changes during recursive case

  Show description for 0b30e81
  

  newren

  authored and

  gitster

  committed
  0b30e81

  Copy full SHA for 0b30e81

Pagination

Previous

Next