Should I remove the list of conflicts in my commit message after doing a manual merge?

Say I run git pull and there is a conflict that git cannot automatically merge. After I manually merge the changes, and run git commit, should I leave the Conflicts: section that git generates in the commit (as a record that those files were manually merged), or removed it (as the conflict is not being […]

How to set environment variables for Laravel 5 on AWS EC2 with MySQL

I have successfully deployed my laravel 5 app to AWS EC2. I have also created a MySQL database with AWS RDS and associated it with my app instance. Now I want to set my env variables so it uses homesteads default values when on my local machine in development, and my AWS database when deployed […]

git locally, push to tfs remote repo

I’m so tired of explaining benefits of using DVCS over CVCS to my teammates. Some of them scared of the learning curve, some of them see no reasons because for them: “tis the same fokin ting”. Personally I’m so tired of TFS and its problems. Everytime when I need to work on some small “fix” […]

How to add missing origin/HEAD in git repo

I have a working git repo. However, I miss the remotes/origin/HEAD -> origin/master when typing git branch -a. Why is the HEAD missing and how can I add the missing HEAD to my repo?

Git lists same file modified and not staged for commit?

For some reason Git is telling me I have a file which is both “to be committed” and also “not staged for commit”? This doesn’t make sense: % git status # On branch master # Changes to be committed: # (use “git reset HEAD <file>…” to unstage) # # modified: Dir1/Dir2/filename.cpp # # Changes not […]

Clarifying/clearing up line ending issues in GIT

We have a repository that was exported from subversion into git. This repository is used by Mac, Linux, and PC users. Needless to say the line endings are a mess. Some files end in CRLF, LF, or CR and some have a mix between all two or three in one file. Adding autocrlf = true […]

Track file inside ignored directory

Some time ago I set up my .gitignore file to not track a folder my_folder with: my_folder/ Now I want to track only a given file inside said folder, named After making .gitignore look like this: my_folder/ !my_folder/ and checking: git status the file does not appear as a change to be committed. What […]

“git format-patch” equivalent for a single file?

A collegue of mine forked my project and we want to incorporate his changed on a single file into my repo, keeping its history (mainly the commit logs). The problem is that he clumsy in his commits so the commits contains diff from other files as well, unrelated to the project (or what need to […]

Git pull – error: The following untracked working tree files would be overwritten by merge:

I keep getting this error when I do a git pull every 60 seconds on my monitoring server. I am using chef and a python script to “git pull” every 60 seconds. Updating 70fe6e8..2da34fc error: The following untracked working tree files would be overwritten by merge: rtb_redis_connections/redis_connections.pyc Please move or remove them before you can […]

How can I find out which files have been modified in a branch?

I have two branches: master and bug1. I checked out bug1, did bunch of changes and multiple commits. How do I get a list of all files that were changed on the branch? I’m not interested in hashes, dates or any other commit related details. I just want to get a simple list of touched […]

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