book

Git Recipes: A Problem-Solution Approach

by Włodzimierz Gajda

December 2013

Beginner

420 pages

9h 17m

English

Apress

Read now

Unlock full access

What is git?1-1. Installing git on Windows1-2. Installing git on Linux1-3. Installing git on OS X1-4. Accessing the manual1-5. Configuring git
2-1. Cloning a repository hosted on Github2-2. Cloning a repository hosted on Bitbucket2-3. Cloning a local repository2-4. Copying a local repository2-5. Exploring the contents of a git repository2-6. Deleting and restoring the contents of the working directory2-7. Cloning a bare repository2-8. Exploring the history with a git log command2-9. Analyzing a repository with git log and shortlog commands2-10. Defining aliases for the commands discussed in Recipes 2-8 and 2-92-11. Analyzing one of the popular repositories2-12. Visualizing the history of a repository2-13. Removing a .git directorySummary
3-1. Creating your first repository3-2. Creating the git snapshot alias3-3. Using the git snapshot alias in your daily work3-4. Mapping names3-5. Restoring revisions with git reset3-6. Restoring revisions with git checkout3-7. Creating a git s alias3-8. Working with reflog3-9. Creating a new repository in an existing project3-10. Losing uncommitted changes3-11. Creating a git simple-commit alias3-12. Loosing commitsSummary

4-1. Staging and committing a new file4-2. Staging and committing a modified file4-3. Committing a modified file4-4. Staging and committing a removed file4-5. Committing a file removed with the standard rm command4-6. Converting an unmodified file into an untracked file4-7. Staging and committing a file renamed with git mv4-8. Committing a file renamed with the standard mv command4-9. Staging all files4-10. Working with mixed statesSummary
5-1. Creating and switching branches5-2. Cloning a repository with branches5-3. Creating a clone-with-branches alias5-4. Committing in a detached HEAD state5-5. Resetting and cleaning a branch5-6. Switching branches in a dirty repository without conflicts5-7. Switching branches in a dirty repository with conflicts5-8. Committing in a wrong branch5-9. Deleting local branches5-10. Using a branch as a backup5-11. Renaming branches5-12. Checking out a file from a different branch5-13. Switching branches in a bare repositorySummary
6-1. Implementing a new feature in a branch6-2. Fast-forwarding branches6-3. Undoing fast-forward6-4. Developing in parallel diverged branches6-5. Merging diverged branches6-6. Avoiding a fast-forward merge6-7. Diverging multiple branches6-8. Merging multiple branchesSummary
7-1. Rebasing divergent branches7-2. Manually rebasing divergent branches7-3. Joining divergent branches into linear history7-4. Diverging three branches7-5. Partial rebasing7-6. Creating bulbs for divergent branches7-7. Creating bulbs in subbranches7-8. Rebasing branches with bulbs7-9. Preserving merges during rebaseSummary
8-1. Amending the most recent revision8-2. Removing n most recent revisions8-3. Squashing many revisions into one revision8-4. Splitting one revision into many revisions8-5. Reordering revisions8-6. Removing several revisions8-7. Editing an old revision8-8. Reverting revisions8-9. Reverting merge commit revisions8-10. Cherry-picking revisions8-11. Squashing a branch8-12. Re-using a reverted branchSummary
9-1. Creating conflicting changes in text files9-2. Resolving textual conflict after merging9-3. Resolving textual conflict after rebasing9-4 Creating conflicting changes in binary files9-5. Resolving a binary conflict during merging9-6. Resolving a binary conflict during rebasing9-7. Forcing a binary mode during mergeSummary
10-1. Manual cloning10-2. Coworking with a central repository10-3. Generating (n-1) merge commits for one commit10-4. Keeping the history linear10-5. Coworking without a central repository10-6. Working with remote branches10-7. Using remote branches for contributions10-8. Accepting contributions10-9. Appending commits to a remote branch10-10. Rewriting history with $ git push -f10-11. Finishing the work on the remote branch10-12. Pushing to non-bare repositoriesSummary
11-1. Installing VirtualBox and Vagrant11-2. Running virtual Linux11-3. Compiling git on a virtual machine11-4. Hosting git repositories over ssh11-5. Simplifying ssh authorization with authorized_keys11-6. Hosting git repositories with git daemon11-7. Hosting git repositories over http11-8. Using Gitweb CGI application11-9. Using a cgit CGI application11-10. Working with gitoliteSummary
12-1. Creating a Github account12-2. Configuring a Github account with SSH keys12-3. Creating a Github-hosted repository for a new project12-4. Creating a Github-hosted repository for an existing project12-5. Creating an organization account on Github12-6. Creating a new project hosted by an organization12-7. Sending pull requests12-8. Reworking your pull requests12-9. Accepting a pull requestHow It WorksSummary
13-1. Working with the $ git diff command13-2. Committing files without line-ending conversion13-3. Checking out files without line-ending conversion13-4. Converting line endings to CRLF in the working directory during checkout and committing the change13-5. Converting line endings to LF and committing the change13-6. Unintended conversion of all line endings13-7. Defining line endings for individual files and directories13-8. Ignoring automatically generated files13-9. Customizing a project with .dist files13-10. Using the .git/info/exclude file13-11. Using tags13-12. Exporting repositories to zipped archivesSummary

Content preview from Git Recipes: A Problem-Solution Approach

CHAPTER 2

Working with Well-Known Repositories

We will start our tour exploring existing and quite well-known repositories. The main goal of this chapter is to get familiar with repositories—their types and structure. In this chapter, you will learn the following:

What are the most popular hosting solutions for git repositories?
How to create a local copy of a repository that is hosted on Github.com or Bitbucket.org?

Once we know how to clone a repository, we can then analyze its structure. Then we will explore the working directory—the git directory and its contents. At that point we will be able to classify a repository as either bare or ...