Git
Download as ODP, PDF1 like345 views
This document discusses several Git terminology and features including reset, HEAD, rebase, index, and interactive rebase. Reset is used to discard commits in the staging area that have not been pushed. HEAD points to the current branch. Rebase is used to integrate changes from one branch into another, such as retrieving updates from master into a feature branch. The index represents a staging area between the work directory and repository. Interactive rebase allows editing existing commits, such as fixing typos, without creating new commits.
Git
- 1. Git Terminology & Handy Features Geeta Vinnakota 7/7/2013
- 2. Reset ● Scenario: Made some commits to the staging area (index), did not push to remote yet, but you do not want them anymore ● Git reset –hard origin/branch_name
- 3. HEAD ● Head is nothing but the current branch ● Cat .git/head
- 4. Rebase ● Scenario: You branched off master and have been working of that feature branch for a while. During that time, there have been several new updates to master. Now to retrieve the history, instead of merging them into your branch, you just rebase your feature branch ● Git rebase origin/branch_name ● Git push feature_branch -f
- 5. Index ● Datastructure that represents a staging area between work directory and the repository ● Git status – gives what is on the index
- 6. Interactive Rebase ● Scenario: You Identify a typo, a possibility of minor refactoring etc. Instead of making a whole new commit, you can do an interactive rebase ● Steps: ● Make the new commit ● Git rebase -i HEAD~#ofcommits ● Present you with various options( select one) ● Do a force push & be careful that you do not push unintended things.
- 7. Interactive Rebase ● Scenario: You Identify a typo, a possibility of minor refactoring etc. Instead of making a whole new commit, you can do an interactive rebase ● Steps: ● Make the new commit ● Git rebase -i HEAD~#ofcommits ● Present you with various options( select one) ● Do a force push & be careful that you do not push unintended things.