Commit Graph

23 Commits

Author SHA1 Message Date
Philippe Miossec 764783b4dd Preserve merges when rebasing in pull command 2013-01-13 14:42:19 +01:00
Philippe Miossec 06242dcbec Add -r option for rebase in 'pull' command 2012-12-24 21:44:10 +01:00
Philippe Miossec 83b13ab7a8 Add a control to permit rebase only when Working directory have no changes 2012-12-16 01:03:42 +01:00
Philippe Miossec 1e8bd02da8 Add an option --rebase on the 'pull' command 2012-12-07 17:16:58 +01:00
Matt Burke bbd8c742ab Convert the rest to NDesk.Options. 2012-02-01 07:27:49 -05:00
Matt Burke 414e09a374 Regions that cover the whole file are useless. 2012-01-31 08:17:29 -05:00
Matt Burke fc5536f70c Convert Pull to NDesk.Options. 2012-01-31 08:01:03 -05:00
Matt Burke 157676c473 Rough-in NDesk.Options. 2012-01-28 12:04:36 -05:00
ivan-danilov 398f1950e2 Taken back check for changes in working copy from pull. 2011-08-16 00:19:17 +03:00
Ryan Hansen 512b4ea437 Fixing an error when running Pull. It was passing the wrong remote.RemoteRef string
Signed-off-by: Matt Burke <spraints@gmail.com>
2011-06-14 07:15:52 -04:00
Ryan Hansen c08f8931ec Fixing compile error. 2011-06-10 20:55:54 -06:00
Matt Burke 2731ebdd69 refactor. 2011-06-10 22:17:02 -04:00
Matt Burke b18420dc36 dos2unix 2011-06-10 22:11:42 -04:00
Ryan Hansen e4f7b83844 Changed git-tfs pull command to throw a GitTfsException if there are local changes that have not been committed. This prevents Issue #25 from occurring. Also added an exception recommendation to stash changes and try pulling again. This is also a new unit test to validate this behavior. 2011-06-10 16:33:36 -06:00
Ryan Hansen 8bd6cf278d Revert "Removed the pull command."
This reverts commit 80d6cf5db8.
2011-06-10 13:48:05 -06:00
Matt Burke 80d6cf5db8 Removed the pull command.
Closes #25.
2011-03-29 09:23:59 -04:00
Matt Burke ba28720fde Use new GitTfsCommandRunner in all commands. 2011-01-26 17:10:35 -05:00
Matt Burke 8419fa8534 Removed a couple of ObjectFactory references. 2010-02-08 15:23:50 -05:00
Matt Burke a281a2097f Cleaned up pull command. 2010-02-08 15:23:09 -05:00
Robert Uhl 3bed67f500 Last few changes from help fix. 2010-02-04 16:42:58 -05:00
Robert Uhl 887bd34c92 starting changes to try to fix help messages. 2010-02-04 15:38:47 -05:00
Robert Uhl b93f64eba2 Functional version of pull implemented, no ancillary options yet. 2010-02-03 16:43:20 -05:00
unknown c45fe03d9f Added stubbed out Pull, minor change to Clone. 2010-01-29 17:32:47 -05:00