mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-13 14:05:06 +01:00
Code
1,322 Commits 22 Branches 138 Tags
Commit Graph

203 Commits

Author SHA1 Message Date
Dr. Peter Poeml
aa36c25505 - add 'help' subcommand (and add help :-) 
- make all subcommands functions -- so they can be used from outside (they
  still print directly their output; they could become iterators later)
- deprecate 'init' subcommand
- 0.5
 2006-05-23 13:48:58 +00:00
Dr. Peter Poeml
211b197b26 - add diff3 merge support. Locally modified files are merged with upstream changes 
if possible, and go into Conflict state if that fails.
- add 'resolved' command to be used after manual merging.
 2006-05-22 14:12:06 +00:00
Dr. Peter Poeml
2c37f7287d - allow 'up' of a project directory (will automatically pull in all new 
packages)
- add NEWS file
 2006-05-22 10:50:37 +00:00