Log In
Or create an account ->
Imperial Library
Home
About
News
Upload
Forum
Help
Login/SignUp
Index
Cover
Title
Copyright
Dedication
Contents at a Glance
Contents
About the Author
About the Technical Reviewer
Acknowledgments
Chapter 1: Getting Started with Git
What is git?
1-1. Installing git on Windows
Problem
Solution
How It Works
1-2. Installing git on Linux
Problem
Solution
How It Works
1-3. Installing git on OS X
Problem
Solution
How It Works
1-4. Accessing the manual
Problem
Solution
How It Works
1-5. Configuring git
Problem
Solution
How It Works
Chapter 2: Working with Well-Known Repositories
2-1. Cloning a repository hosted on Github
Problem
Solution
How It Works
2-2. Cloning a repository hosted on Bitbucket
Problem
Solution
How It Works
2-3. Cloning a local repository
Problem
Solution
How It Works
2-4. Copying a local repository
Problem
Solution
How It Works
2-5. Exploring the contents of a git repository
Problem
Solution
How It Works
Conclusion
2-6. Deleting and restoring the contents of the working directory
Problem
Solution
How It Works
2-7. Cloning a bare repository
Problem
Solution
How It Works
2-8. Exploring the history with a git log command
Problem
Solution
How It Works
2-9. Analyzing a repository with git log and shortlog commands
Problem
Solution
How It Works
2-10. Defining aliases for the commands discussed in Recipes 2-8 and 2-9
Problem
Solution
How It Works
2-11. Analyzing one of the popular repositories
Problem
Solution
How It Works
2-12. Visualizing the history of a repository
Problem
Solution
How It Works
2-13. Removing a .git directory
Problem
Solution
How It Works
Summary
Chapter 3: Creating Local Repositories with Linear History
3-1. Creating your first repository
Problem
Solution
How It Works
3-2. Creating the git snapshot alias
Problem
Solution
How It Works
3-3. Using the git snapshot alias in your daily work
Problem
Solution
How It Works
3-4. Mapping names
Problem
Solution
How It Works
3-5. Restoring revisions with git reset
Problem
Solution
How It Works
3-6. Restoring revisions with git checkout
Problem
Solution
How It Works
3-7. Creating a git s alias
Problem
Solution
How It Works
3-8. Working with reflog
Problem
Solution
How It Works
3-9. Creating a new repository in an existing project
Problem
Solution
How It Works
3-10. Losing uncommitted changes
Problem
Solution
How It Works
3-11. Creating a git simple-commit alias
Problem
Solution
How It Works
3-12. Loosing commits
Problem
Solution
How It Works
Conclusion
Summary
Chapter 4: Managing Files
4-1. Staging and committing a new file
Problem
Solution
How It Works
4-2. Staging and committing a modified file
Problem
Solution
How It Works
4-3. Committing a modified file
Problem
Solution
How It Works
4-4. Staging and committing a removed file
Problem
Solution
How It Works
4-5. Committing a file removed with the standard rm command
Problem
Solution
How It Works
4-6. Converting an unmodified file into an untracked file
Problem
Solution
How It Works
4-7. Staging and committing a file renamed with git mv
Problem
Solution
How It Works
4-8. Committing a file renamed with the standard mv command
Problem
Solution
How It Works
4-9. Staging all files
Problem
Solution
How It Works
4-10. Working with mixed states
Problem
Solution
How It Works
Summary
The repository’s structure
Chapter 5: Branches
5-1. Creating and switching branches
Problem
Solution
How It Works
5-2. Cloning a repository with branches
Problem
Solution
How It Works
5-3. Creating a clone-with-branches alias
Problem
Solution
How It Works
5-4. Committing in a detached HEAD state
Problem
Solution
How It Works
5-5. Resetting and cleaning a branch
Problem
Solution
How It Works
5-6. Switching branches in a dirty repository without conflicts
Problem
Solution
How It Works
5-7. Switching branches in a dirty repository with conflicts
Problem
Solution
How It Works
5-8. Committing in a wrong branch
Problem
Solution
How It Works
5-9. Deleting local branches
Problem
Solution
How It Works
5-10. Using a branch as a backup
Problem
Solution
How It Works
5-11. Renaming branches
Problem
Solution
How It Works
5-12. Checking out a file from a different branch
Problem
Solution
How It Works
5-13. Switching branches in a bare repository
Problem
Solution
How It Works
Summary
Chapter 6: Merging Branches
6-1. Implementing a new feature in a branch
Problem
Solution
How It Works
6-2. Fast-forwarding branches
Problem
Solution
How It Works
6-3. Undoing fast-forward
Problem
Solution
How It Works
6-4. Developing in parallel diverged branches
Problem
Solution
How It Works
6-5. Merging diverged branches
Problem
Solution
How It Works
6-6. Avoiding a fast-forward merge
Problem
Solution
How It Works
6-7. Diverging multiple branches
Problem
Solution
How It Works
6-8. Merging multiple branches
Problem
Solution
How It Works
Summary
Chapter 7: Rebasing Branches
7-1. Rebasing divergent branches
Problem
Solution
How It Works
7-2. Manually rebasing divergent branches
Problem
Solution
How It Works
7-3. Joining divergent branches into linear history
Problem
Solution
How It Works
7-4. Diverging three branches
Problem
Solution
How It Works
7-5. Partial rebasing
Problem
Solution
How It Works
7-6. Creating bulbs for divergent branches
Problem
Solution
How It Works
7-7. Creating bulbs in subbranches
Problem
Solution
How It Works
7-8. Rebasing branches with bulbs
Problem
Solution
How It Works
7-9. Preserving merges during rebase
Problem
Solution
How It Works
Summary
Chapter 8: Modifying the History
8-1. Amending the most recent revision
Problem
Solution
How It Works
8-2. Removing n most recent revisions
Problem
Solution
How It Works
8-3. Squashing many revisions into one revision
Problem
Solution
How It Works
8-4. Splitting one revision into many revisions
Problem
Solution
How It Works
8-5. Reordering revisions
Problem
Solution
How It Works
8-6. Removing several revisions
Problem
Solution
How It Works
8-7. Editing an old revision
Problem
Solution
How It Works
8-8. Reverting revisions
Problem
Solution
How It Works
8-9. Reverting merge commit revisions
Problem
Solution
How It Works
8-10. Cherry-picking revisions
Problem
Solution
How It Works
8-11. Squashing a branch
Problem
Solution
How It Works
8-12. Re-using a reverted branch
Problem
Solution
How It Works
Summary
Chapter 9: Resolving Conflicts
9-1. Creating conflicting changes in text files
Problem
Solution
How It Works
9-2. Resolving textual conflict after merging
Problem
Solution
How It Works
9-3. Resolving textual conflict after rebasing
Problem
Solution
How It Works
9-4 Creating conflicting changes in binary files
Problem
Solution
How It Works
9-5. Resolving a binary conflict during merging
Problem
Solution
How It Works
9-6. Resolving a binary conflict during rebasing
Problem
Solution
How It Works
9-7. Forcing a binary mode during merge
Problem
Solution
How It Works
Summary
Chapter 10: Remote Repositories and Synchronization
10-1. Manual cloning
Problem
Solution
How It Works
10-2. Coworking with a central repository
Problem
Solution
How It Works
10-3. Generating (n-1) merge commits for one commit
Problem
Solution
How It Works
10-4. Keeping the history linear
Problem
Solution
How It Works
10-5. Coworking without a central repository
Problem
Solution
How It Works
10-6. Working with remote branches
Problem
Solution
How It Works
10-7. Using remote branches for contributions
Problem
Solution
How It Works
10-8. Accepting contributions
Problem
Solution
How It Works
10-9. Appending commits to a remote branch
Problem
Solution
How It Works
10-10. Rewriting history with $ git push -f
Problem
Solution
How It Works
10-11. Finishing the work on the remote branch
Problem
Solution
How It Works
10-12. Pushing to non-bare repositories
Problem
Solution
How It Works
Summary
Chapter 11: Hosting git Git Repositories
11-1. Installing VirtualBox and Vagrant
Problem
Solution
How It Works
11-2. Running virtual Linux
Problem
Solution
How It Works
11-3. Compiling git on a virtual machine
Problem
Solution
How It Works
11-4. Hosting git repositories over ssh
Problem
Solution
$ vagrant halt: How It Works
11-5. Simplifying ssh authorization with authorized_keys
Problem
Solution
How It Works
11-6. Hosting git repositories with git daemon
Problem
Solution
How It Works
11-7. Hosting git repositories over http
Problem
Solution
How It Works
11-8. Using Gitweb CGI application
Problem
Solution
How It Works
11-9. Using a cgit CGI application
Problem
Solution
How It Works
11-10. Working with gitolite
Problem
Solution
How It Works
Summary
The protocols used by git
Chapter 12: Working with Github.com
12-1. Creating a Github account
Problem
Solution
How It Works
12-2. Configuring a Github account with SSH keys
Problem
Solution
How It Works
12-3. Creating a Github-hosted repository for a new project
Problem
Solution
How It Works
12-4. Creating a Github-hosted repository for an existing project
Problem
Solution
How It Works
12-5. Creating an organization account on Github
Problem
Solution
How It Works
12-6. Creating a new project hosted by an organization
Problem
Solution
How It Works
12-7. Sending pull requests
Problem
Solution
How It Works
12-8. Reworking your pull requests
Problem
Solution
How It Works
12-9. Accepting a pull request
Problem
Solution
How It Works
Summary
Chapter 13: More Recipes
13-1. Working with the $ git diff command
Problem
Solution
How It Works
13-2. Committing files without line-ending conversion
Problem
Solution
How It Works
13-3. Checking out files without line-ending conversion
Problem
Solution
How It Works
13-4. Converting line endings to CRLF in the working directory during checkout and committing the change
Problem
Solution
How It Works
13-5. Converting line endings to LF and committing the change
Problem
Solution
How It Works
13-6. Unintended conversion of all line endings
Problem
Solution
How It Works
13-7. Defining line endings for individual files and directories
Problem
Solution
How It Works
13-8. Ignoring automatically generated files
Problem
Solution
How It Works
13-9. Customizing a project with .dist files
Problem
Solution
How It Works
13-10. Using the .git/info/exclude file
Problem
Solution
How It Works
13-11. Using tags
Problem
Solution
How It Works
13-12. Exporting repositories to zipped archives
Problem
Solution
How It Works
Summary
Index
← Prev
Back
Next →
← Prev
Back
Next →