version-control

问题 Is there an option like --author of git-commit for git-merge? We maintain a staging environment where some changes must be performed. Some limitations make us to use only one linux user to access staging environment. Anyway, we are a small team with cooperative initiative and we tell when doing commits, which one is the author using the --author git-commit option. However, some times we need to merge from other branches which result in a non-ff merge. This implies a commit is performed when

问题 Are there any CLI commands that can be used to get a list of Tags that have been created on a branch or head of a module within a specified time frame? What I briefly need is a list of Tags and the date when they were created. Given following parameters Module Name Branch Name (or :: HEAD) Start Date End Date 回答1: I just learned: cvs status -v Lists all tags and braches for each and any file together with the revision it belongs to. You could work from there ... 回答2: One can list tags or

问题 I have an Access DB that I would like to extract the source code from so I can put it into Source control. I have tried to extract the data using the Primary Interop Assemblies(PIA), but I am getting issues as it is not picking up all of the modules and forms. There are 140 Forms and Modules in the code(Don't ask, it's a legacy system I have inherited) but the PIA code is only picking up 91 of them. Here is the code I am using. using System; using Microsoft.Office.Interop.Access; namespace

问题 As we all know, git is very popular in these days, since it is highly efficient for it has all the history on local computer, and retrieve of history can be done without network. Maybe for extranet users, the network issue is not that important, but git also have other kinds of advantages, such as lightweight branch (i am still not sure what is the differece between it and svn's branch, why git's branch is light weight)? I also know lots of person is still using subversion, why? If git is

问题 My original problem is that I have a directory where I write various scripts. Each of them is independent of others, and usually one-file-long. I want to have some versioning applied to them, but I have the following problems/requirements: I don't want to have to store each small script in a separate directory ! I don't want to store them all in one repository OTOH, as they are completely unrelated, and: some of them may later grow to more files (and then they will need a separate dir), I

问题 My original problem is that I have a directory where I write various scripts. Each of them is independent of others, and usually one-file-long. I want to have some versioning applied to them, but I have the following problems/requirements: I don't want to have to store each small script in a separate directory ! I don't want to store them all in one repository OTOH, as they are completely unrelated, and: some of them may later grow to more files (and then they will need a separate dir), I

问题 Folks, We have a number of Source Safe databases that should be migrated to SubVersion. Is there a (tested and proven) way to migrate them with history ? Thanks Essam 回答1: You can try VssMigrate. It is a C# port of PowerAdmin's VssMigrate which has the capability to "Resolve the individual VSS-checkins to atomic SVN commits via the approximate timestamp". 回答2: I'm considering the migration too and I have found some pages that may help you in the process: Moving from Visual SourceSafe to

问题 I'm working with a repository that in theory should be following the Gitflow Workflow (see A successful git branching model by Vincent Driessen). However, the initial commit on the repository was made on the develop branch and there is no master branch to be seen. It's nearing release time and I need to create a master branch that reflects the production-ready state of the project which should've been there from the start. Keep in mind that the develop branch has multiple feature branches

问题 When I right-clicked in my Android Studio project (in the Android view), I used to have a "Git" submenu. There I could pull, push, etc. However, that 'Git' menu is now gone, somehow. As a result, I can neither push nor pull. Where can I enable that again? 回答1: Try this way , In Android Studio enable the version control for the project by, VCS –> Enable Version Control Integration Open command line/terminal and add the project to Git repository by, git remote add Add files by, VCS –> Git –>

问题 Setting up new git installations. On one Windows laptop, I'm running (under cygwin): git daemon --base-path=/cygdrive/c/work/proj/ My project's root is c:\work\proj\proj1. There is a c:\work\proj\proj1\.git directory. git-daemon-export-ok exists in c:\work\proj\proj1. (git-daemon-export-ok can be an empty file, yes?) On another Windows computer, on the same local network, I've tried many variations of this (under cygwin): git clone git://xx.xx.xx.xx/proj1 I expect that the daemon will append