Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2013-01-19Merge changes I7e7fae12,I87ecca00Robin Rosenberg2-4/+124
2013-01-19Add conflicts message before footerStefan Lay1-0/+42
2013-01-19Only replace the ChangeId in the footer, not in the bodyStefan Lay1-4/+82
2013-01-19Merge "Fix patch application WRT windows line endings."Robin Rosenberg1-0/+10
2013-01-19Fix patch application WRT windows line endings.Markus Duft1-0/+10
2013-01-19Merge "Update DfsGarbageCollector to not read back a pack index."Colby Ranger1-4/+14
2013-01-19Update DfsGarbageCollector to not read back a pack index.Colby Ranger1-4/+14
2013-01-19Merge "Define a tree filter for user-visible changes between two indexes"Robin Rosenberg1-0/+199
2013-01-18Add additional FastForwardMode enums for different config contextsTomasz Zarna1-0/+69
2013-01-16Define a tree filter for user-visible changes between two indexesRobin Rosenberg1-0/+199
2013-01-13Fix concurrent creation of fan-out object directoriesRoberto Tyley1-0/+77
2013-01-11Accept '-' instead of space in enum config valuesShawn Pearce1-1/+1
2013-01-11Revert "Add additional FastForwardMode enums for different config contexts"Shawn Pearce1-77/+2
2013-01-11Fix enum parsing from Config filesShawn Pearce1-0/+3
2013-01-10Merge changes Ifc8fc3e5,I7c403b50Colby Ranger2-3/+2
2013-01-10Remove packIndex field from FileObjDatabase openPack method.Colby Ranger2-3/+2
2013-01-10Peel tags during resolve of foo^Dave Borowitz1-0/+2
2013-01-09Delete the iplog generatorMatthias Sohn1-6/+0
2013-01-08Return info about config subsection when trying to get an invalid enumTomasz Zarna1-0/+19
2013-01-07Add additional FastForwardMode enums for different config contextsTomasz Zarna1-2/+77
2013-01-04Ignore removed files with an assume-valid index entryRobin Rosenberg1-4/+9
2012-12-28Update the revert command and things relating to revertRobin Rosenberg1-0/+208
2012-12-27Hide deprecation warnings in some test classesRobin Rosenberg4-0/+4
2012-12-27Declare essentially static methods as staticRobin Rosenberg38-72/+87
2012-12-27Add type argumente to some raw reclarationRobin Rosenberg4-14/+16
2012-12-15DirCacheIterator: Fix reset() and back()Robin Rosenberg1-0/+128
2012-12-03Support --cached in RmCommandRobin Stocker1-1/+15
2012-11-21RevWalk support for shallow clonesMarc Strapetz2-21/+216
2012-11-19Add support for rebase interactive 'edit' commandDariusz Luksza1-0/+52
2012-11-19Add support for rebase interactive 'reword' commandDariusz Luksza1-0/+58
2012-11-19Add GarbageCollectCommand to porcelain APIMatthias Sohn1-0/+90
2012-11-16Add support for pull with --rebase and --no-rebaseMikael Karlsson1-0/+70
2012-11-16Adapt Status and CleanCommand to support cleaning directoriesMarkus Duft2-3/+99
2012-11-16CheckoutCommand: Support checking out ours and theirsRobin Stocker1-3/+45
2012-11-16DirCacheEditor: Apply PathEdit for each stageRobin Stocker1-0/+43
2012-11-12CommitCommand: Ensure unmerged paths are added correctly with setOnlyRobin Stocker1-0/+54
2012-11-01Add ReflogCommandTest#testAmendReflogTomasz Zarna1-0/+32
2012-11-01ResetCommand: Use DirCacheBuilder in resetIndexRobin Stocker1-0/+30
2012-11-01ResetCommand: Correctly reset unmerged paths in resetIndexForPathsRobin Stocker1-0/+32
2012-10-31Merge "Refactor ResolveMergerTest to allow testing multiple strategies"Chris Aniszczyk1-35/+67
2012-10-28Pull up method for creating DirCacheEntry into RepositoryTestCaseRobin Stocker6-139/+95
2012-10-25Suppress resource warnings with Java 7Robin Rosenberg7-17/+43
2012-10-25Merge "Add a check in fstick that the reference file exists"Shawn Pearce1-0/+2
2012-10-25Merge "Fix for Iff768422c, use offset 0 when going back to work tree iterator"Shawn Pearce1-0/+41
2012-10-25Add a check in fstick that the reference file existsRobin Rosenberg1-0/+2
2012-10-25Merge "Don't allow null name or e-mail in PersonIdent"Shawn Pearce1-0/+10
2012-10-25Refactor ResolveMergerTest to allow testing multiple strategiesChristian Halstrick1-35/+67
2012-10-22StashCreateCommand: Abort in case of unmerged pathsRobin Stocker2-0/+46
2012-10-13Don't allow null name or e-mail in PersonIdentRobin Stocker1-0/+10
2012-10-07CommitCommand: Use original author on amend if author is not setRobin Stocker1-0/+44

Back to the top