Commits

Breadcrumbs

History for

ondotdevelop

User selector

All users

All time

Commit History

Commits on Feb 28, 2018

• Return TransientIndex from ObjectDatabase.MergeCommitsIntoIndex

  tyrielv

  committed
  32f3409

  Copy full SHA for 32f3409

Commits on Feb 12, 2018

• Add MergeCommitsIntoIndex to ObjectDatabase

  tyrielv

  committed
  504f95e

  Copy full SHA for 504f95e

Commits on Nov 19, 2017

• Fix test warnings

  bording

  committed
  e3d2565

  Copy full SHA for e3d2565

Commits on Jun 24, 2017

• Added IgnoreWhitespaceChange option to MergeOptions;

  

  Evgeny Trifonov

  authored and

  ethomson

  committed
  2fada18

  Copy full SHA for 2fada18

Commits on Mar 30, 2016

• Move some versions of Checkout to Commands

  carlosmn

  committed
  7f4a17f

  Copy full SHA for 7f4a17f

Commits on Mar 29, 2016

• Move Remove to Commands

  Show description for 2d4d66d
  carlosmn

  committed
  2d4d66d

  Copy full SHA for 2d4d66d

• Move Stage and Unstage to Commands and keep the index in memory

  Show description for 7a9d52b
  carlosmn

  committed
  7a9d52b

  Copy full SHA for 7a9d52b

Commits on Mar 8, 2016

• Remove the explicit repository isolation in tests

  Show description for 1bd1cd5
  carlosmn

  committed
  1bd1cd5

  Copy full SHA for 1bd1cd5

Commits on Dec 11, 2015

• Don't throw on merge conflict

  Show description for 6d14e31
  carlosmn

  committed
  6d14e31

  Copy full SHA for 6d14e31

Commits on Dec 10, 2015

• Update to libgit2 a27f31d8

  carlosmn

  committed
  575df91

  Copy full SHA for 575df91

Commits on Oct 31, 2015

• Fix compilation warnings

  nulltoken

  committed
  f37a4eb

  Copy full SHA for f37a4eb

Commits on May 28, 2015

• Introduce CheckoutConflictException

  Show description for ac524f3
  

  Edward Thomson

  committed
  ac524f3

  Copy full SHA for ac524f3

Commits on May 11, 2015

• Give FileStatus enum entries more meaningful names

  Show description for 79d30b1
  

  nulltoken

  authored and

  fermaem

  committed
  79d30b1

  Copy full SHA for 79d30b1

Commits on Apr 9, 2015

• Introduce ObjectDatabase.MergeCommits

  Show description for 63da0d3
  

  Edward Thomson

  committed
  63da0d3

  Copy full SHA for 63da0d3

Commits on Mar 17, 2015

• Optimize import directives

  nulltoken

  committed
  930f63c

  Copy full SHA for 930f63c

Commits on Feb 4, 2015

• Fix misspelled enum

  jamill

  committed
  bd06dac

  Copy full SHA for bd06dac

Commits on Feb 1, 2015

• Deprecate Branch.Checkout()

  nulltoken

  committed
  19cd9f5

  Copy full SHA for 19cd9f5

Commits on Jan 4, 2015

• Sandbox every test

  Show description for 27fbde6
  nulltoken

  committed
  27fbde6

  Copy full SHA for 27fbde6

• Rename Clone() test helper method in Sandbox()

  nulltoken

  committed
  7e57858

  Copy full SHA for 7e57858

Commits on Oct 31, 2014

• Move higher level Index operations to IRepository

  Show description for 7a31788
  

  JPaulDuncan

  authored and

  nulltoken

  committed
  7a31788

  Copy full SHA for 7a31788

Commits on Aug 27, 2014

• Remove trailing whitespaces

  nulltoken

  committed
  520b1aa

  Copy full SHA for 520b1aa

Commits on Jul 14, 2014

• FastForward merge should block if there are checkout conflicts.

  Show description for 91456eb
  jamill

  committed
  91456eb

  Copy full SHA for 91456eb

Commits on Jun 18, 2014

• Introduce merge.ff configuration handling

  Show description for 6bfe4ab
  

  Edward Thomson

  committed
  6bfe4ab

  Copy full SHA for 6bfe4ab

Commits on May 3, 2014

• Update Checkout and Merge options

  Show description for 9015578
  jamill

  committed
  9015578

  Copy full SHA for 9015578

Commits on Apr 26, 2014

• Cleanup whitespaces

  nulltoken

  committed
  5a00322

  Copy full SHA for 5a00322

Commits on Apr 9, 2014

• Introduce new merge functionality, including Pull, merge options, and

  Show description for c7e11bb
  jamill

  committed
  c7e11bb

  Copy full SHA for c7e11bb

Commits on Feb 6, 2014

• Enhance merge test coverage to better test possible outcomes.

  angusbjones

  committed
  97adc9d

  Copy full SHA for 97adc9d

Commits on Jan 16, 2014

• Initial merge functionality.

  Show description for cc4bb2d
  

  angusbjones

  authored and

  jamill

  committed
  cc4bb2d

  Copy full SHA for cc4bb2d

Commits on Nov 8, 2013

• Deprecated ResetOptions in favor ResetMode.

  

  Pavel Belousov

  committed
  2553c80

  Copy full SHA for 2553c80

Commits on Jul 1, 2013

• Favor Constants.Signature over BaseFixture.DummySignature

  yorah

  committed
  fd398ef

  Copy full SHA for fd398ef

• Cleanup usings

  yorah

  committed
  dcafac6

  Copy full SHA for dcafac6

Commits on Jun 21, 2013

• Add InitNewRepository() test helper

  nulltoken

  committed
  5e40bff

  Copy full SHA for 5e40bff

• Leverage Touch() to generate test files

  nulltoken

  committed
  f62b134

  Copy full SHA for f62b134

Commits on Apr 8, 2013

• Make test directory clones consistent

  dahlbyk

  committed
  8738461

  Copy full SHA for 8738461

Commits on Mar 14, 2013

• Clean-up trailing whitespaces

  Show description for f705718
  yorah

  committed
  f705718

  Copy full SHA for f705718