posh-git | 易学教程

How can I accept all remote files in a specific folder during a git merge?

阅读更多关于 How can I accept all remote files in a specific folder during a git merge?

问题 We're using posh-git on Windows Powershell for source control. We're in the unenviable position of storing some of our built assemblies in our git repo. I know all the sermons on why you shouldn't do that, but we have to live with it for now. Thankfully they are in a separate solution, but sometimes two people work on that solution in their own branch simultaneously, and the last one in gets to take the merge conflict. The process, of course, looks something like this: Person A lands their

How do I create a master branch in a bare Git repository?

阅读更多关于 How do I create a master branch in a bare Git repository?

问题 (All done in poshgit on Windows 8): git init --bare test-repo.git cd test-repo.git (Folder is created with git-ish files and folders inside) git status fatal: This operation must be run in a work tree (Okay, so I can't use git status with a bare repo; makes sense I guess) git branch (Nothing, it seems the bare repo doesn't contain any branches. Do I have to add them from a cloned repo?) cd .. mkdir test-clone cd test-clone git clone ../test-repo.git (I get a warning about cloning an empty

How to use posh-git that comes with GitHub for Windows from custom shell?

阅读更多关于 How to use posh-git that comes with GitHub for Windows from custom shell?

问题 Installing GitHub for Windows is a nice way to get at once beginner's git Windows app, msysgit and posh-git - but you can only start the git shell with posh-git by calling "GitHub.appref-ms --open-shell". What I want to do, is to start a console, load powershell, and use posh-git that comes with Github for Windows - but I can't figure a way to load it into the powershell. Update: I do not want to install Git for Windows separately, since msysgit is already installed. I was able to make some

How to use posh-git that comes with GitHub for Windows from custom shell?

阅读更多关于 How to use posh-git that comes with GitHub for Windows from custom shell?

Installing GitHub for Windows is a nice way to get at once beginner's git Windows app, msysgit and posh-git - but you can only start the git shell with posh-git by calling "GitHub.appref-ms --open-shell". What I want to do, is to start a console, load powershell, and use posh-git that comes with Github for Windows - but I can't figure a way to load it into the powershell. Update: I do not want to install Git for Windows separately, since msysgit is already installed. I was able to make some progress by calling the shell1.ps1 script from AppData\Local\Github folder - and it does let me invoke