msysgit

When cloning git repo under Windows I get “error: unable to create file <file>… (Is a directory)”

久未见 提交于 2019-12-07 10:55:52
问题 Z:\>git clone git://github.com/kennethreitz/httpbin.git Cloning into 'httpbin'... remote: Counting objects: 1073, done. remote: Compressing objects: 100% (401/401), done. remote: Total 1073 (delta 672), reused 1045 (delta 651) Receiving objects: 100% (1073/1073), 114.42 KiB | 128 KiB/s, done. Resolving deltas: 100% (672/672), done. error: unable to create file httpbin/templates/... (Is a directory) git version 1.8.0.msysgit.0, Windows Vista SP2 x64 What's wrong? 回答1: I think the trouble is

GIT .mailmap works per repo, but not in global, why?

随声附和 提交于 2019-12-07 05:13:40
问题 I have a group of repos and I have a .mailmap file to combine user names. My .mailmap file works for all the repos, when it is in the root of each. I tried to put the file in my ~/.gitconfig file and it doesn't work. Im using Git for Windows and in my global .gitconfig file I added this: >> git config --global mailmap.file "~/.mailmap" Thats the command I used. Also tried the log shown below. [log] mailmap = ~/.mailmap [mailmap] file = C:/Documents and Settings/<username>/.mailmap Both lead

File mode with msysgit

佐手、 提交于 2019-12-07 02:35:36
问题 I cloned a Git repository from Windows using msysgit (v1.7.7) on a network drive. Some files are marked on the repository to have mode 100755. Using the git bash tool from Windows, the ls -l command effectively shows the good permissions for those file. Now when I access the repository directory from Linux, those files have 644 permissions instead of 755. If I chmod them to 755 on the Linux side and go back to the git bash tool on Windows: the ls -l command still shows the files to have 755

What does git-config(1) mean when it says “colors are used only when the output is to a terminal”?

霸气de小男生 提交于 2019-12-07 01:34:12
问题 I'm outputting to a terminal, but Git is not correctly detecting that I'm outputting to a terminal, for the purposes of coloring the output. My question is, what does git-config(1) really mean when it says "colors are used only when the output is to a terminal" (this phrase appears at the end of multiple config descriptions, such as for color.ui and color.branch)? In other words, how does Git decide whether or not it's outputting to a terminal, and how do I change my environment settings to

How can I get git and copSSH to look in the correct directory for keys?

折月煮酒 提交于 2019-12-06 12:04:42
I just installed copSSH for Windows. When I boot it up I get a directory C:\copSSH\home\Nick\.ssh which has my pub and private key it. When I access this directory via a Cygwin bash window using ssh user@host I get happily logged in. However, when I open a git bash window with git clone ssh://user@host it tries to access the keys in C:\Users\Nick\.ssh , which gives me a "permission denied" error. How can I fix git so everything is using C:\copSSH\home\Nick\.ssh as the directory? The environment variables set by copSSH are not the same than the one found in a git bash Windows. (see also OpenSSH

How to use my changes for merge in git?

大城市里の小女人 提交于 2019-12-06 06:21:37
问题 How do I force "my changes" when merging in git? Someone put all bin directories in git and now I have a terrible merge conflict :( Now it says the following: When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". I do NOT want to merge, i just want to delete all those files using my changes. EDIT: Most of the files was successfully

Git workflow tips

戏子无情 提交于 2019-12-06 06:14:55
I started using git and have been using it for couple of months now, and I am curious if my workflow is correct. I work from two different places on the project. here are the stages of my workflow: I pull the project from remote repo make a local branch for a new feature make changes and commit merge the branch with master push to the remote is this correct way of working on the project? As Amber said : First, let's just make something clear: there is no single "correct" workflow for Git. There are merely workflows that work - and specifically, workflows that work for you. There is a good post

Git config alias doesn't work anymore

梦想的初衷 提交于 2019-12-06 03:54:51
问题 I used command: git config --global alias.st status to add my first alias as suggested by post - How do I alias commands in git? Then, I found it being added to config file at: C:\Users\damodar.bashyal\.gitconfig So, i added bunch of aliases directly on the config file and all worked perfectly until today when I had to restart my computer after installing MYOB software. When i tried to use alias none worked. So, i added another alias using above command, but the file didn't get updated but

When cloning git repo under Windows I get “error: unable to create file <file>… (Is a directory)”

爱⌒轻易说出口 提交于 2019-12-05 16:05:58
Z:\>git clone git://github.com/kennethreitz/httpbin.git Cloning into 'httpbin'... remote: Counting objects: 1073, done. remote: Compressing objects: 100% (401/401), done. remote: Total 1073 (delta 672), reused 1045 (delta 651) Receiving objects: 100% (1073/1073), 114.42 KiB | 128 KiB/s, done. Resolving deltas: 100% (672/672), done. error: unable to create file httpbin/templates/... (Is a directory) git version 1.8.0.msysgit.0, Windows Vista SP2 x64 What's wrong? I think the trouble is this file here in you repo: https://github.com/kennethreitz/httpbin/blob/master/httpbin/templates/ ... ... is

msysgit sh.exe arguments

依然范特西╮ 提交于 2019-12-05 15:02:33
问题 I am trying to find some documentation about msysgit sh.exe command. For instance I am aware of the --login flag to launch a git bash session but I would to know the other possibilities. I have looked over the internet but can not find any place where is listed all the possibles arguments. 回答1: > .\sh.exe --help GNU bash, version 3.1.0(1)-release-(i686-pc-msys) Usage: ".../Git/bin/sh.exe" [GNU long option] [option] ... ".../Git/bin/sh.exe" [GNU long option] [option] script-file ... GNU long