Managing your local branches
by Jakub Narębski, Rasmus Voss, Aske Olsson, Ferdinando Santacroce
Git: Mastering Version Control
- Git: Mastering Version Control
- Table of Contents
- Git: Mastering Version Control
- Git: Mastering Version Control
- Credits
- Preface
- I. Module 1
- 1. Getting Started with Git
- 2. Git Fundamentals – Working Locally
- 3. Git Fundamentals – Working Remotely
- 4. Git Fundamentals – Niche Concepts, Configurations, and Commands
- Dissecting the Git configuration
- Configuration architecture
- Configuration levels
- Listing configurations
- Editing configuration files manually
- Setting up other environment configurations
- Basic configurations
- 5. Obtaining the Most – Good Commits and Workflows
- The art of committing
- Adopting a workflow – a wise act
- Summary
- 6. Migrating to Git
- 7. Git Resources
- II. Module 2
- 1. Navigating Git
- 2. Configuration
- 3. Branching, Merging, and Options
- 4. Rebase Regularly and Interactively, and Other Use Cases
- 5. Storing Additional Information in Your Repository
- 6. Extracting Data from the Repository
- 7. Enhancing Your Daily Work with Git Hooks, Aliases, and Scripts
- Introduction
- Using a branch description in the commit message
- Creating a dynamic commit message template
- Using external information in the commit message
- Preventing the push of specific commits
- Configuring and using Git aliases
- Configuring and using Git scripts
- Setting up and using a commit template
- 8. Recovering from Mistakes
- Introduction
- Undo – remove a commit completely
- Undo – remove a commit and retain the changes to files
- Undo – remove a commit and retain the changes in the staging area
- Undo – working with a dirty area
- Redo – recreate the latest commit with new changes
- Revert – undo the changes introduced by a commit
- Reverting a merge
- Viewing past Git actions with git reflog
- Finding lost changes with git fsck
- 9. Repository Maintenance
- Introduction
- Pruning remote branches
- Running garbage collection manually
- Turning off automatic garbage collection
- Splitting a repository
- Rewriting history – changing a single file
- Back up your repositories as mirror repositories
- A quick submodule how-to
- Subtree merging
- Submodule versus subtree merging
- 10. Patching and Offline Sharing
- 11. Git Plumbing and Attributes
- Introduction
- Displaying the repository information
- Displaying the tree information
- Displaying the file information
- Writing a blob object to the database
- Writing a tree object to the database
- Writing a commit object to the database
- Keyword expansion with attribute filters
- Metadata diff of binary files
- Storing binaries elsewhere
- Checking the attributes of a file
- Attributes to export an archive
- 12. Tips and Tricks
- III. Module 3
- 1. Git Basics in Practice
- An introduction to version control and Git
- Git by example
- Repository setup
- Creating a Git repository
- Cloning the repository and creating the first commit
- Publishing changes
- Examining history and viewing changes
- Renaming and moving files
- Updating your repository (with merge)
- Creating a tag
- Resolving a merge conflict
- Adding files in bulk and removing files
- Undoing changes to a file
- Creating a new branch
- Merging a branch (no conflicts)
- Undoing an unpublished merge
- Summary
- 2. Exploring Project History
- 3. Developing with Git
- 4. Managing Your Worktree
- Ignoring files
- File attributes
- Fixing mistakes with the reset command
- Stashing away your changes
- Managing worktrees and the staging area
- Multiple working directories
- Summary
- 5. Collaborative Development with Git
- 6. Advanced Branching Techniques
- Types and purposes of branches
- Branching workflows and release engineering
- Interacting with branches in remote repositories
- Summary
- 7. Merging Changes Together
- 8. Keeping History Clean
- An introduction to Git internals
- Rewriting history
- Amending history without rewriting
- Summary
- 9. Managing Subprojects – Building a Living Framework
- Managing library and framework dependencies
- Managing large Git repositories
- Summary
- 10. Customizing and Extending Git
- 11. Git Administration
- 12. Git Best Practices
- 1. Git Basics in Practice
- A. Bibliography
- Index
- Configuration architecture
- Dissecting the Git configuration
Suppose you are just having your local Git repository, and you have no intentions at the moment to share the code with others; however, you can easily share this knowledge while working with a repository with one or more remotes. Local branches with no remotes work exactly in this fashion. As you can see in the examples, we are cloning a repository, thus we have a remote.
Let's start by creating a few local branches.
Use the following command to clone the jgit repository to match:
$ git clone https://git.eclipse.org/r/jgit/jgit $ cd jgit
Perform the following steps to manage your local branches:
- Whenever you start working on a bug fix or a new feature in your project, you should create a branch. You can do so using the following code:
$ git branch newBugFix $ git branch * master newBugFix
- The
newBugFixbranch points to the currentHEADI was on at the time of the creation. You can see theHEADwithgit log -1:$ git log -1 newBugFix --format=format:%H 25fe20b2dbb20cac8aa43c5ad64494ef8ea64ffc
- If you want to add a description to the branch, you can do it with the
--edit-descriptionoption for thegit branchcommand:$ git branch --edit-description newBugFix - The previous command will open an editor where you can type in a description:
Refactoring the Hydro controller The hydro controller code is currently horrible needs to be refactored.
- Close the editor and the message will be saved.
Git stores the information in the local git config file; this also means that you cannot push this information to a remote repository.
To retrieve the description for the branch, you can use the --get flag for the git config command:
$ git config --get branch.newBugFix.description Refactoring the Hydro controller The hydro controller code is currently horrible needs to be refactored.
This will be beneficial when we automate some tasks in Chapter 7, Enhancing Your Daily Work with Git Hooks, Aliases, and Scripts.
The branch information is stored as a file in .git/refs/heads/newBugFix:
$ cat .git/refs/heads/newBugFix 25fe20b2dbb20cac8aa43c5ad64494ef8ea64ffc
Note that it is the same commit hash we retrieved with the git log command
Maybe you want to create specific branches from specific commit hashes. The first thought might be to check out the commit, and then create a branch; however, it is much easier to use the git branch command to create the branches without checking out the commits:
- If you need a branch from a specific commit hash, you can create it with the
git branchcommand as follows:$ git branch anotherBugFix 979e346 $ git log -1 anotherBugFix --format=format:%h 979e346 $ git log -1 anotherBugFix --format=format:%H 979e3467112618cc787e161097986212eaaa4533
- As you can see, the abbreviated commit hash is shown when you use
h, and the full commit hash is shown when you useH. You can see the abbreviated commit hash is the same as the one used to create the branch. Most of the time, you want to create and start working on the branch immediately:$ git checkout -b lastBugFix 979e346 Switched to a new branch 'lastBugFix'
- Git switches to the new branch immediately after it creates the branch. Verify with Gitk to see whether the
lastBugFixbranch is checked out and anotherBugFixbranch is at the same commit hash:$ gitk
- Instead of using Gitk, you can also add
-vto thegit branchcommand or even anotherv.$ git branch -v anotherBugFix 979e346 Interactive Rebase: Do actions if * lastBugFix 979e346 Interactive Rebase: Do actions if master 25fe20b Add missing package import for jg newBugFix 25fe20b Add missing package import for jg
- With
-v, you can see the abbreviated commit hash for each branch and with-vv, you can also see that themasterbranch tracks theorigin/masterbranch:$ git branch -vv anotherBugFix 979e346 Interactive Rebase: Do actions if e * lastBugFix 979e346 Interactive Rebase: Do actions if e master 25fe20b [origin/master] Add missing package newBugFix 25fe20b Add missing package import for g
-
No Comment
..................Content has been hidden....................
You can't read the all page of ebook, please click here login for view all page.