learngitwithme.wordpress.com
Merging | Get Git Wit!
https://learngitwithme.wordpress.com/2016/02/23/merging
February 23, 2016. We will see this in action now. To do that lets first enumerate some of the reasons for creating a branch. We will then take one of them as an example. The scenarios are as follows:. You are working on something that you are not sure about that it will work. You are about to make some changes that may not be used (some POC). You are told to branch out, so that other can commit to the main line of dev. There are three kinds of merges, we will discuss all of those now:. As you can see no...
learngitwithme.wordpress.com
Tagging | Get Git Wit!
https://learngitwithme.wordpress.com/2016/02/25/tagging
February 25, 2016. This post will discuss the following:. Why do we need tags? 1 Why do we need tags? Tagging is nothing but putting some kind of helpful marker in the commit history with which you can easily move to that commit. 2 Types of tags. There are two types of tags in Git: lightweight and annotated tags. These are just like branches and only are a pointer to a particular commit in history. 3 Tags in action. Find below few commands to interact and use tags in Git:. Push all the tags to remote ...
learngitwithme.wordpress.com
Git aliases | Get Git Wit!
https://learngitwithme.wordpress.com/2016/02/21/git-aliases
February 21, 2016. I find Git aliases very handy. These are the shorthands that you can setup for some of the Git long commands. This will make your experience will Git much more simpler, easier and more familiar. I will provide you an example of how to create and how it works. This will be followed by some of the sample aliases that you could setup. And then it is upto you to become creative and use it as per your convenience. How to create Git alias. Git alias in action. Branching explained →. What is ...
learngitwithme.wordpress.com
Git fetch explained | Get Git Wit!
https://learngitwithme.wordpress.com/2016/02/23/fetch-vs-merge
February 23, 2016. Here we going to discuss about two ways of taking changes from a remote repository and updating the local repository. Lets outline what we will be going through in this post:. Remote repository and local repository revisited. Remote repository and local repository revisited. Remote repository – This is the remote and is shared by other members who are actively working on it. Assume here that you just cloned a project and this is how the local and remote repositories look like. We assum...
learngitwithme.wordpress.com
Ignoring files | Get Git Wit!
https://learngitwithme.wordpress.com/2016/02/20/ignoring-files
February 20, 2016. The following topics will be discussed in this post:. Overview of tracked and untracked files. When do you want to ignore certain files? 1 Overview of tracked and untracked files. We have already learnt the concept of tracked and untracked files in the previous posts. Just to recap:. Tracked files – These are the files that Git keeps tap on as these files were a part of the last snapshot. So any changes made to them will be notified to us by Git. The obvious question that will come to ...
learngitwithme.wordpress.com
Undo in Git! | Get Git Wit!
https://learngitwithme.wordpress.com/2016/02/24/undo-in-git
February 24, 2016. We have learned a lot during the course of this blog till now. I think its now important to know how to undo things in Git. This could come in handy if you have done something by mistake. We are going to look into the following in this post:. Undoing working directory changes. Changing the last commit. 1 Undoing working directory changes. Here lets say you have made some changes to a tracked file. So the file is in modified state. Assume that you made some changes and staged that file&...
learngitwithme.wordpress.com
Branching explained | Get Git Wit!
https://learngitwithme.wordpress.com/2016/02/23/branching-explained
February 23, 2016. Branching in simple terms, as the name suggests is deviation from a main part. In Git it means exactly the same. Now, when will you encounter situation when you would like to deviate from the main development stream? Well it really depends upon what strategy you are using to collaborate in your team for the project. some of the scenarios are as follows:. You are working on something that you are not sure about that it will work. We will now discuss the following:. Let us see this below:.
learngitwithme.wordpress.com
Viewing the commit history | Get Git Wit!
https://learngitwithme.wordpress.com/2016/02/20/viewing-the-commit-history
Viewing the commit history. February 20, 2016. At any point of time, you can go ahead and look at the commit history. This will help you understand the following and many more:. What changes were made to a particular project in every commit. Who made the changes. Why the changes were made. For this post, let us leave the repository that we have and clone some public repository. We are going to discuss the following commands:. Git log –oneline. Git log –oneline –graph. Git log –stat. Git log –oneline.
learngitwithme.wordpress.com
Rebasing | Get Git Wit!
https://learngitwithme.wordpress.com/2016/02/24/rebasing
February 24, 2016. There are two ways of integrating changes from one branch into another. One of those methods is merging, which we already discussed and the other one is rebase. We will discuss what rebase does and see it in action. So the agenda for this post:. Rebase basically takes changes from one of the branch and replays those on top of another branch. Lets us try and visualize this. Apply additional changes that were introduced by my-new-feature (C4) and. As you can see above, the history is muc...
learngitwithme.wordpress.com
Get Git Wit! | Page 2
https://learngitwithme.wordpress.com/page/2
There are two ways of integrating changes from one branch into another. One of those methods is merging, which we already discussed and the other one is rebase. We will discuss what rebase does and see it in action. So the agenda for this post:. Rebase basically takes changes from one of the branch and replays those on top of another branch. Lets us try and visualize this. Apply additional changes that were introduced by my-new-feature (C4) and. Base it on top of additional commit made by master (C5).
