Git file permissions on Windows

I’ve read through a few questions regarding file permissions in Git and I’m still a bit confused. I’ve got a repo on GitHub forked from another. Post merge, they should be identical. However: $ git diff –summary origin/epsilon master/epsilon mode change 100644 => 100755 ants/dist/sample_bots/csharp/ mode change 100644 => 100755 ants/dist/starter_bots/coffeescript/ mode change 100644 => […]

What does “@@ -1 +1 @@” mean in Git's diff output?

I’ve been collecting data from the information returned from git diff <commitId>..<commitId> and I ran into @@ -1 +1 @@ I can’t figure out what that’s telling me. I’ve searched a bit on Google but to no avail.

Does git clone work through NTLM proxies?

I’ve tried both using export http_proxy=http://[username]:[pwd]@[proxy] and git config –global http.proxy http://[username]:[pwd]@[proxy]. I couldn’t make it work. It looks like git uses Basic authentication: Initialized empty Git repository in /home/…/.git/ * Couldn’t find host in the .netrc file, using defaults * About to connect() to port 8080 (#0) * Trying 10…. * Connected […]

Git – Ignoring a specific modification to a config file

I have a config file in our project that holds a connection string to the database, as well as several application settings, e.g: … <setting name=”ConnectionString”><value>Server=prodServer;Database=myDataBase;</value></setting> <setting name=”AnotherSetting1″><value>Lorem</value></setting> <setting name=”AnotherSetting2″><value>Ipsum</value></setting> <setting name=”AnotherSetting3″><value>dolor </value></setting> … During my development, I always change the ConnectionString value to my local database which causes git to put the file mark […]

Show the original branch for a commit

I’ve used git-blame to find a particular commit. Now I want to find the branch that it originally came from. (From there, I’ll use the branch name to find the particular ticket) Let’s define “original branch” as “the branch to which the commit was made before the branch was merged into any other branch”.

Garbage collect commits in git

I have some commits created by git subtree that I want to have garbage collect (more that any practical purpose just to understand what and why can get collected). I have already checked that these commits are not referenced the following ways: # In any reflog > git reflog –all –no-abbrev-commit | grep <hash> (no […]

Getting cmake to run before building after pulling from git

There is this project kept in a git repository, which we build with cmake and ninja. We are using globbing expressions/functions to collect all the source files to be compiled. That means that every time a file is added/removed, cmake has to be called to re-parse the directories. We have seen this is bringing some […]

git ahead/behind info between master and branch?

I have created a branch for testing in my local repo (test-branch) which I pushed to Github. If I go to my Github account and select this test-branch it shows the info: This branch is 1 commit ahead and 2 commits behind master My questions are: How can I display this info locally (ie: a […]

Source Tree Unity project Ghost files

Recently changed my Gitignore which was fine until i pulled down on another machine to find some of the project was not there. So i have switched back to my old git ignore but now as soon as i open the project and go to source tree these files and folders need pushing every time. […]

Remove deleted files from git history

I’m trying to split a subproject off of my git repository. However unlike in Detach (move) subdirectory into separate Git repository I don’t have it in it’s own subdirectory (and moving it in and doing the above only yields the history after the move). I’ve cloned the branch from which I want to split off […]

Git Baby is a git and github fan, let's start git clone.