Commits

Branch selector

 aacb82d

User selector

All users

Datepicker

All time

Commit History

Commits on Aug 14, 2011

• 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

• merge-recursive: Remember to free generated unique path names

  Show description for 3d6b8e8
  

  newren

  authored and

  gitster

  committed
  3d6b8e8

  Copy full SHA for 3d6b8e8

• merge-recursive: Consolidate different update_stages functions

  Show description for 650467c
  

  newren

  authored and

  gitster

  committed
  650467c

  Copy full SHA for 650467c

• merge-recursive: Mark some diff_filespec struct arguments const

  Show description for 0c05942
  

  newren

  authored and

  gitster

  committed
  0c05942

  Copy full SHA for 0c05942

• merge-recursive: Correct a comment

  Show description for abafc88
  

  newren

  authored and

  gitster

  committed
  abafc88

  Copy full SHA for abafc88

• merge-recursive: Make BUG message more legible by adding a newline

  Show description for c43ba42
  

  newren

  authored and

  gitster

  committed
  c43ba42

  Copy full SHA for c43ba42

• t6022: Add testcase for merging a renamed file with a simple change

  Show description for 7dd9c30
  

  newren

  authored and

  gitster

  committed
  7dd9c30

  Copy full SHA for 7dd9c30

• t6022: New tests checking for unnecessary updates of files

  Show description for f1a0f45
  

  newren

  authored and

  gitster

  committed
  f1a0f45

  Copy full SHA for f1a0f45

• t6022: Remove unnecessary untracked files to make test cleaner

  Show description for 5b5261b
  

  newren

  authored and

  gitster

  committed
  5b5261b

  Copy full SHA for 5b5261b

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

  Show description for 0b35deb
  

  newren

  authored and

  gitster

  committed
  0b35deb

  Copy full SHA for 0b35deb

• t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify

  Show description for a0d3311
  

  newren

  authored and

  gitster

  committed
  a0d3311

  Copy full SHA for a0d3311

• t6036: tests for criss-cross merges with various directory/file conflicts

  Show description for 827f2b7
  

  newren

  authored and

  gitster

  committed
  827f2b7

  Copy full SHA for 827f2b7

• t6036: criss-cross with weird content can fool git into clean merge

  Show description for 96b079e
  

  newren

  authored and

  gitster

  committed
  96b079e

  Copy full SHA for 96b079e

• t6036: Add differently resolved modify/delete conflict in criss-cross test

  Show description for fe7e9c2
  

  newren

  authored and

  gitster

  committed
  fe7e9c2

  Copy full SHA for fe7e9c2

• t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts

  Show description for c696606
  

  newren

  authored and

  gitster

  committed
  c696606

  Copy full SHA for c696606

• t6042: Ensure rename/rename conflicts leave index and workdir in sane state

  Show description for f0b75fc
  

  newren

  authored and

  gitster

  committed
  f0b75fc

  Copy full SHA for f0b75fc

• t6042: Add tests for content issues with modify/rename/directory conflicts

  Show description for ac6e839
  

  newren

  authored and

  gitster

  committed
  ac6e839

  Copy full SHA for ac6e839

• t6042: Add a testcase where undetected rename causes silent file deletion

  Show description for a0551f2
  

  newren

  authored and

  gitster

  committed
  a0551f2

  Copy full SHA for a0551f2

• t6042: Add a pair of cases where undetected renames cause issues

  Show description for 7b4ed59
  

  newren

  authored and

  gitster

  committed
  7b4ed59

  Copy full SHA for 7b4ed59

• t6042: Add failing testcase for rename/modify/add-source conflict

  Show description for 5804023
  

  newren

  authored and

  gitster

  committed
  5804023

  Copy full SHA for 5804023

• t6042: Add a testcase where git deletes an untracked file

  Show description for 695576f
  

  newren

  authored and

  gitster

  committed
  695576f

  Copy full SHA for 695576f

Commits on Jun 9, 2011

• fetch: do not leak a refspec

  Show description for d8ead15
  

  meyering

  authored and

  gitster

  committed
  d8ead15

  Copy full SHA for d8ead15

Commits on Jun 1, 2011

• Git 1.7.5.4

  Show description for e5af0de
  gitster

  committed
  e5af0de

  Copy full SHA for e5af0de

• Merge branch 'jk/maint-config-alias-fix' into maint

  Show description for 1c6e351
  gitster

  committed
  1c6e351

  Copy full SHA for 1c6e351

• Merge branch 'jc/fmt-req-fix' into maint

  Show description for 6e1a751
  gitster

  committed
  6e1a751

  Copy full SHA for 6e1a751

• Merge branch 'jk/maint-docs' into maint

  Show description for 2dd7984
  gitster

  committed
  2dd7984

  Copy full SHA for 2dd7984

• Merge branch 'jn/doc-remote-helpers' into maint

  Show description for 24263cf
  gitster

  committed
  24263cf

  Copy full SHA for 24263cf

• Merge branch 'kk/maint-prefix-in-config-mak' into maint

  Show description for c72b914
  gitster

  committed
  c72b914

  Copy full SHA for c72b914

• diffcore-rename.c: avoid set-but-not-used warning

  Show description for 6051561
  

  meyering

  authored and

  gitster

  committed
  6051561

  Copy full SHA for 6051561

Commits on May 31, 2011

• Start 1.7.5.4 draft release notes

  Show description for 2b0b64e
  gitster

  committed
  2b0b64e

  Copy full SHA for 2b0b64e

Pagination

Previous

Next