This post is for people who are already familiar with Git and work on multiple branches (esp. feature branches). By practice, feature branches are the branches created from a root branch (master or any other as per your branching model) and once feature is complete/tested - they are merged back into the same root branch. Working in...
git log is one of most useful commands to see information about commit , author , date and subject(comment) while using GIT.This displays information in blocks and hardly 5 - 7 can be listed on normal screen size. But git provides --pretty option , so that we can format the output of git log; Here are some ways to do that ...
Hello there .. Writing my first blog , I am still amazed by the effectiveness of working with Git . No matter how many times you mess up.. you can still end up with a Clean Working directory. (Believe me .. ;) ) . I have also heard about the frustrating merge situations people have been in .. but I guess it has more to do with...
Still in my early days of using Git. Recently just to make sure that I have merged two branches and have pushed changes to QA server successfully,I often used command "find | xargs grep" .But to deal with this kind of situations Git provides "grep" command. Just as name suggests this commands searches for regex pattern passed to it. ...
Recently in one of my projects, I had to bring the content of old-forgotten-deleted file back to the application code base using Git. The problem took a 'fancy' turn as the path to the file was no more a valid path in Git as there had been a major refactorings in our project esp. renaming of the packages as well as the folder structure...
Our project went into production a few weeks back and was on Grails 1.3.1. Since the code was stable, we decided that it was time to upgrade to grails 1.3.4. However, we didn't want to push it straight to the QA Server or Production server because that would've meant that the maintenance of the existing production code would become a...
We have been using GitHub for version control in one of our projects and I am absolutely loving it! There are quite many advantages over a concurrent version control system like subversion. One of the commands I found useful was the stash command. It is of use when we are working on a piece of functionality, which is not in a state to...