Index

A note on the digital index

A link in an index entry is displayed as the section title in which that entry appears. Because some sections have multiple index markers, it is not unusual for an entry to have several links to the same section. Clicking on any link will take you directly to the place in the text in which the marker appears.

Symbols

# (pound sign), The .gitignore File, A Merge with a Conflict, Using git rebase -i
comment, The .gitignore File, A Merge with a Conflict, Using git rebase -i
$GIT_DIR variable, The Git Command Line, refs and symrefs
* (asterisk), The .gitignore File, Viewing Branches
globbing, The .gitignore File
show-branch, Viewing Branches
+ (plus sign), Viewing Branches, Diffs, git diff with conflicts, The refspec
diff, Diffs
merges, git diff with conflicts
refsepc, The refspec
show-branch, Viewing Branches
- (minus sign), The Git Command Line, Diffs
diff, Diffs
-- (double dash), The Git Command Line
. (dot), Adding a File to Your Repository, Dos and Don’ts in Branch Names
.. (double dots), Commit Ranges, git diff and Commit Ranges, Generating Patches
/ (forward slash), The .gitignore File, Dos and Don’ts in Branch Names, gitlinks
-3 or --3way options (git am command), Applying Patches
< (left), git log with conflicts
> (right), git log with conflicts
^ (caret), Relative Commit Names
~ (tilde), Relative Commit Names
… (triple dots), Commit Ranges, git diff and Commit Ranges

A

-a option (git commit command), Using git commit --all, Forms of the git diff Command
--abbrev-commit option (git log command), Viewing Old Commits
abbreviations, Absolute Commit Names, Relative Commit Names
carets and tildes, Relative Commit Names
commit IDs, Absolute Commit Names
--abort option (git rebase command), Rebasing Commits
--abort option (git am command), Applying Patches
aborting, Aborting or Restarting a Merge
merges, Aborting or Restarting a Merge
absolute commit names, Absolute Commit Names
commit IDs, Absolute Commit Names
access, Repositories with Controlled Access, Repositories with Anonymous Read Access, Publishing using Git and HTTP daemons, Repositories with Anonymous Write Access
anonymous read access, Repositories with Anonymous Read Access, Publishing using Git and HTTP daemons
anonymous write access, Repositories with Anonymous Write Access
controlled access, Repositories with Controlled Access
accountability, The Birth of Git
of VCSs, The Birth of Git
add, Adding a File to Your Repository, A Detailed View of Git’s Object Model and Files, Finishing Up a Conflict Resolution
git add command, Adding a File to Your Repository, A Detailed View of Git’s Object Model and Files, Finishing Up a Conflict Resolution
adding, Using git add, Adding a New Developer, Adding and Deleting Remote Branches
developers, Adding a New Developer
remote branches, Adding and Deleting Remote Branches
using git add command, Using git add
aliases, Configuring an Alias, Hooks
configuring, Configuring an Alias
--all option (git commit command), Using git commit --all
Already up-to-date merges, Degenerate Merges
altering, Altering Commits, rebase Versus merge
commits, Altering Commits, rebase Versus merge
am, Applying Patches, Patch-Related Hooks
git am command, Applying Patches, Patch-Related Hooks
--amend option (git commit command), Changing the Top Commit, Changing the Top Commit
annotated tags, Tags
defined, Tags
anonymous read access, Repositories with Anonymous Read Access, Publishing using Git and HTTP daemons
anonymous write access, Repositories with Anonymous Write Access
applying, Applying Patches, Applying Patches, Applying Patches
git apply command, Applying Patches
patches, Applying Patches, Applying Patches
applypatch-msg hook, Patch-Related Hooks
arrows, Object Store Pictures
between commits, Object Store Pictures
asterisk, Viewing Branches (see *)
atomic changesets, Atomic Changesets
commits, Atomic Changesets
atomic transactions, The Birth of Git
of VCSs, The Birth of Git
author name, Adding a File to Your Repository
error message, Adding a File to Your Repository
--author option (git commit command), Changing the Top Commit
authoritative repositories, Creating an Authoritative Repository
creating, Creating an Authoritative Repository
--authors-file option (git svn command), Example: A Shallow Clone of a Single Branch

B

-b option (git checkout command), Creating and Checking Out a New Branch
back-up strategies, Background
backups, No One True History
peer-to-peer, No One True History
bad patches, Bad Patches
--bare option (git clone command), Bare and Development Repositories, Creating an Authoritative Repository
bare repositories, Bare and Development Repositories
defined, Bare and Development Repositories
base files, Applying Patches
diffs, Applying Patches
--base option (git diff command), git diff with conflicts
binary merge driver, Merge Drivers
bisect, Using git bisect, Using git bisect, Squash Merges
git bisect command, Using git bisect, Using git bisect, Squash Merges
bisect replay, Using git bisect
git bisect replay command, Using git bisect
bisect visualize, Using git bisect
git bisect visualize command, Using git bisect
BitKeeper, The Birth of Git, Precedents
blame, Using git blame, Squash Merges
git blame command, Using git blame, Squash Merges
blobs, Git Object Types, Object Store Pictures, Objects, Hashes, and Blobs
about, Git Object Types
pictures of, Object Store Pictures
using, Objects, Hashes, and Blobs
branches, The Birth of Git, Viewing Your Commits, Object Store Pictures, refs and symrefs, Using gitk to view the commit graph, Branches, Deleting Branches, Reasons for Using Branches, Branch Names, Using Branches, Using Branches, Using Branches, Creating Branches, Creating Branches, Creating Branches, Listing Branch Names, Viewing Branches, Checking Out Branches, Detached HEAD Branches, Deleting Branches, Deleting Branches, Remote Repositories, Tracking Branches, Tracking Branches, Make Your Own origin Remote, The merge or rebase step, Adding and Deleting Remote Branches, Patching Versus Merging, Example: A Shallow Clone of a Single Branch, Committing Through git svn rebase, Pushing, Pulling, Branching, and Merging with git svn, How dcommit handles merges, Cloning All the Branches
adding and deleting remote branches, Adding and Deleting Remote Branches
checking out, Checking Out Branches, Detached HEAD Branches
cloning, Example: A Shallow Clone of a Single Branch, Committing Through git svn rebase, Cloning All the Branches
creating, Creating Branches
deleting, Deleting Branches, Deleting Branches
fetching and merging with complex histories, Patching Versus Merging
git branch command, Creating Branches
git show-branch command, Viewing Your Commits
git svn command, Pushing, Pulling, Branching, and Merging with git svn, How dcommit handles merges
in VCSs, The Birth of Git
lifetime, Creating Branches
and merges, Using Branches
merging, The merge or rebase step
names, refs and symrefs, Branch Names, Listing Branch Names
pictures of, Object Store Pictures
publishing, Using Branches
purpose, Reasons for Using Branches
remote tracking branches, Tracking Branches
start points, Using gitk to view the commit graph
tracking, Remote Repositories, Tracking Branches, Make Your Own origin Remote
using, Using Branches
viewing, Viewing Branches
building Git for open source release, Building and Installing, Building and Installing

C

--cached option (git diff command), It’s All About the Index, Using git rm, Forms of the git diff Command
caches, Reconstructing the git-svn cache, Reconstructing the git-svn cache
git-svn cache, Reconstructing the git-svn cache, Reconstructing the git-svn cache
caret (^), Relative Commit Names
cat command, Configuration Files
changes, Checking Out When You Have Uncommitted Changes, Merging Changes into a Different Branch, Submitting Your Changes Upstream
merging into different branches, Merging Changes into a Different Branch
submitting project changes upstream, Submitting Your Changes Upstream
uncommitted, Checking Out When You Have Uncommitted Changes
changesets, Atomic Changesets
atomic changesets, Atomic Changesets
check-ref-format, Dos and Don’ts in Branch Names
git check-ref-format command, Dos and Don’ts in Branch Names
checkouts, Checking Out Branches, Detached HEAD Branches, Checking Out Branches, Detached HEAD Branches, How Git Keeps Track of Conflicts, reset, revert, and checkout, The Old Solution: Partial Checkouts, The Automated Solution: Checking Out Subprojects Using Custom Scripts
branches, Checking Out Branches, Detached HEAD Branches
git checkout command, Checking Out Branches, Detached HEAD Branches, How Git Keeps Track of Conflicts, reset, revert, and checkout
partial checkouts, The Old Solution: Partial Checkouts
subprojects using scripts, The Automated Solution: Checking Out Subprojects Using Custom Scripts
cherry-pick, Using git cherry-pick
git cherry-pick command, Using git cherry-pick
circles, Object Store Pictures
pictures of, Object Store Pictures
classifications, File Classifications in Git
files, File Classifications in Git
clones, Making a Copy of Your Repository, Repositories, Remote Repositories, Bare and Development Repositories, Creating an Authoritative Repository, Cloning a Repository, Hooks, The Automated Solution: Checking Out Subprojects Using Custom Scripts, gitlinks, Example: A Shallow Clone of a Single Branch, Committing Through git svn rebase, Cloning All the Branches
branches, Example: A Shallow Clone of a Single Branch, Committing Through git svn rebase, Cloning All the Branches
defined, Remote Repositories
git clone command, Making a Copy of Your Repository, Repositories, Bare and Development Repositories, Creating an Authoritative Repository, Cloning a Repository, Hooks, The Automated Solution: Checking Out Subprojects Using Custom Scripts, gitlinks
collisions, Objects, Hashes, and Blobs
SHA1, Objects, Hashes, and Blobs
--color option (git diff command), Forms of the git diff Command
combining, Combining Projects, The git submodule Command
projects, Combining Projects, The git submodule Command
command line, The Git Command Line
using, The Git Command Line
commit author, Configuring the Commit Author
configuring, Configuring the Commit Author
commit differences, Viewing Commit Differences
viewing, Viewing Commit Differences
commit IDs, Identifying Commits, Relative Commit Names, Absolute Commit Names, refs and symrefs, Relative Commit Names, Keeping Your Commit IDs Straight
absolute, Absolute Commit Names
relative, Relative Commit Names
symbolic, refs and symrefs
commit log messages, Writing Commit Log Messages
writing, Writing Commit Log Messages
commit-msg hooks, Commit-Related Hooks
commits, Making Another Commit, Viewing Your Commits, Git Object Types, Commits, It’s All About the Index, Using git commit --all, A Detailed View of Git’s Object Model and Files, Commits, Using Pickaxe, Atomic Changesets, Identifying Commits, Relative Commit Names, Viewing Old Commits, Commit Ranges, Commit Graphs, Using gitk to view the commit graph, Commit Ranges, Commit Ranges, Finding Commits, Using Pickaxe, Forms of the git diff Command, git diff and Commit Ranges, git diff and Commit Ranges, git diff and Commit Ranges, Squash Merges, Altering Commits, rebase Versus merge, Changing the Top Commit, Changing the Top Commit, Separate Commit and Publish Steps, Role Duality, Patches, Generating Patches, Patches and Topological Sorts, Commit-Related Hooks, Fetching Before Committing, Committing Through git svn rebase
about, Git Object Types
altering, Altering Commits, rebase Versus merge
atomic changesets, Atomic Changesets
before committing, Fetching Before Committing
distributed version control, Separate Commit and Publish Steps
exchanging, Patches
finding, Finding Commits, Using Pickaxe
git commit command, Using git commit --all, Changing the Top Commit, Changing the Top Commit
git diff command, Forms of the git diff Command
graphs, Commit Graphs, Using gitk to view the commit graph
history, Viewing Old Commits, Commit Ranges
hooks, Commit-Related Hooks
identifying, Identifying Commits, Relative Commit Names
index, It’s All About the Index
linearization, Patches and Topological Sorts
making, Making Another Commit
order of in git diff command, git diff and Commit Ranges
ranges, Commit Ranges, Commit Ranges, git diff and Commit Ranges, git diff and Commit Ranges
ranges and merges, Generating Patches
squash commits, Squash Merges
steps in, A Detailed View of Git’s Object Model and Files
svn rebase, Committing Through git svn rebase
transferring between upstream and downstream repositories, Role Duality
using, Commits
viewing, Viewing Your Commits
comparing, A Note on Git’s Use of SHA1
objects, A Note on Git’s Use of SHA1
Concurrent Version System (CVS), Precedents
config, git config
git config command, git config
configuration files, Configuration Files
configuring, Configuring the Commit Author, Configuring an Alias, Repositories, Remote Configuration
aliases, Configuring an Alias
commit author, Configuring the Commit Author
configuration values when cloning, Repositories
remote repositories, Remote Configuration
conflicted files, Locating Conflicted Files
locating, Locating Conflicted Files
conflicts, A Merge with a Conflict, Aborting or Restarting a Merge, Merge Conflicts
merges, A Merge with a Conflict, Aborting or Restarting a Merge, Merge Conflicts
consumers, Role Duality
upstream and downstream, Role Duality
content, Pathname Versus Content
versus pathnames, Pathname Versus Content
content tracking, Git Tracks Content, Git Tracks Content
content-addressable names, Content-Addressable Names
--continue option (git rebase command), Rebasing Commits
controlled access, Repositories with Controlled Access
repositories, Repositories with Controlled Access
copying, Importing Subprojects by Copying
importing subprojects, Importing Subprojects by Copying
creating, Creating Branches, Creating and Checking Out a New Branch, Creating an Authoritative Repository, Creating Your First Hook
authoritative repositories, Creating an Authoritative Repository
branches, Creating Branches, Creating and Checking Out a New Branch
hooks, Creating Your First Hook
criss-cross merges, Merge Strategies, Recursive merges
current repository, Remotes
defined, Remotes
CVS (Concurrent Version System), Precedents, Tags, The Old Solution: Partial Checkouts, The Obvious Solution: Import the Code into Your Project
Cygwin Git, Installing Git on Windows, Installing the Cygwin Git Package
about, Installing Git on Windows
installing on Windows, Installing the Cygwin Git Package

D

-d option (git branch command), Deleting Branches
daemon-run, Debian/Ubuntu
git-daemon-run, Debian/Ubuntu
daemons, Repositories with Anonymous Read Access, Publishing using Git and HTTP daemons, Publishing repositories using an HTTP daemon
git-daemon, Repositories with Anonymous Read Access, Publishing using Git and HTTP daemons
HTTP daemon, Publishing repositories using an HTTP daemon
DAG (directed acyclic graph), Commit Graphs, No One True History, Patches and Topological Sorts, gitlinks
about, Commit Graphs
gitlinks, gitlinks
history ambivalence, No One True History
topological sort, Patches and Topological Sorts
data structures, Repositories
(see also index; object stores)
Debian Linux distributions, Debian/Ubuntu
installing Git, Debian/Ubuntu
degenerate merges, Degenerate Merges
deleting, Deleting Branches, Deleting Branches, Adding and Deleting Remote Branches
branches, Deleting Branches, Deleting Branches
remote branches, Adding and Deleting Remote Branches
depot directory, Example Using Remote Repositories
detached HEAD, Using git bisect, Detached HEAD Branches, Tracking Branches, How dcommit handles merges
bisect mode, Using git bisect
branches, Detached HEAD Branches, Tracking Branches
developer role, The Maintainer and Developer Roles
distributed repositories, The Maintainer and Developer Roles
developers, Adding a New Developer
adding, Adding a New Developer
development repositories, Bare and Development Repositories
defined, Bare and Development Repositories
diffs, Viewing Commit Differences, It’s All About the Index, A Note on Tracking Renames, Viewing Old Commits, Diffs, Comparing How Subversion and Git Derive diffs, Forms of the git diff Command, Forms of the git diff Command, Simple git diff Example, Simple git diff Example, git diff and Commit Ranges, git diff and Commit Ranges, A Merge with a Conflict, git diff with conflicts, git diff with conflicts, Merge Drivers, Generating Patches, Applying Patches, Importing Subprojects with git pull -s subtree
base files, Applying Patches
commit ranges, git diff and Commit Ranges, git diff and Commit Ranges
drivers, Merge Drivers
git diff command, Viewing Commit Differences, It’s All About the Index, Viewing Old Commits, Forms of the git diff Command, Forms of the git diff Command, A Merge with a Conflict, git diff with conflicts, git diff with conflicts, Generating Patches, Importing Subprojects with git pull -s subtree
simple git diff example, Simple git diff Example, Simple git diff Example
tracking between files, A Note on Tracking Renames
digests, A Note on Git’s Use of SHA1
SHA1 hashes, A Note on Git’s Use of SHA1
directed acyclic graph, Commit Graphs (see DAG)
directories, Pathname Versus Content, Inside the .git directory, Preparing for a Merge, Example Using Remote Repositories
depot directory, Example Using Remote Repositories
dirty, Preparing for a Merge
.git directory, Inside the .git directory
structure, Pathname Versus Content
dirty working directory or index, Preparing for a Merge
disk space, Comparing How Subversion and Git Derive diffs
saving in SVN, Comparing How Subversion and Git Derive diffs
distributed development, The Birth of Git
distributed repositories, Distributed Repository Structure, Changing Public History, Role Duality, Changing Public History, Upstream and Downstream Flows, The Maintainer and Developer Roles
living with, Changing Public History
maintainer and developer roles, The Maintainer and Developer Roles
structure, Distributed Repository Structure
upstream and downstream flows, Upstream and Downstream Flows
dot (.), Adding a File to Your Repository, Dos and Don’ts in Branch Names
double dash (--), The Git Command Line
double dots (..), Commit Ranges, git diff and Commit Ranges, Generating Patches
downstream consumers, Role Duality
downstream flows, Upstream and Downstream Flows
distributed repositories, Upstream and Downstream Flows
downstream producers, Role Duality
downstream repositories, Role Duality
transferring between upstream and downstream repositories, Role Duality
drivers, Merge Drivers, Merge Drivers
diff drivers, Merge Drivers
merge drivers, Merge Drivers

E

editing, Manual Editing
configuration manually, Manual Editing
editors, Adding a File to Your Repository, Writing Commit Log Messages
commit log messages, Writing Commit Log Messages
environment variables, Adding a File to Your Repository
efficiency, The Birth of Git, Commits
SHA1, Commits
of VCS, The Birth of Git
email, Debian/Ubuntu, Mailing Patches, Mailing Patches, Bad Patches
git-email, Debian/Ubuntu
patches, Mailing Patches, Bad Patches
SMTP open relay servers, Mailing Patches
environment variables, Adding a File to Your Repository
editors, Adding a File to Your Repository
error messages, Adding a File to Your Repository
/etc/gitconfig file, Configuration Files
exchanging, Patches
commits, Patches

F

-f option (git rm command, Using git rm, Checking Out When You Have Uncommitted Changes, Make Your Own origin Remote, Non-Fast-Forward Pushes
fast-forward merges, Degenerate Merges, Non-Fast-Forward Pushes
Fedora Linux distributions, Other Binary Distributions
installing Git, Other Binary Distributions
fetch step, The fetch step
remote repositories, The fetch step
fetches, The refspec, Fetching the Alternate History, Fetching Before Committing
before committing, Fetching Before Committing
git fetch command, The refspec, Fetching the Alternate History
FETCH_HEAD symref, refs and symrefs
files, Adding a File to Your Repository, Removing and Renaming Files in Your Repository, Removing and Renaming Files in Your Repository, Configuration Files, Git Object Types, Git Tracks Content, Pathname Versus Content, Inside the .git directory, Files and Trees, File Management and the Index, A Detailed View of Git’s Object Model and Files, File Classifications in Git, Using git add, Using git add, Using git rm, A Note on Tracking Renames, The .gitignore File, The .gitignore File, A Detailed View of Git’s Object Model and Files, Atomic Changesets, refs and symrefs, Locating Conflicted Files, Applying Patches
adding to repositories, Adding a File to Your Repository
base files and diffs, Applying Patches
classifications, File Classifications in Git
configuration files, Configuration Files
file content, Git Object Types (see blobs)
Git Directory names, refs and symrefs
.git files, Inside the .git directory
Git object model, A Detailed View of Git’s Object Model and Files
.gitignore files, The .gitignore File
globbing, The .gitignore File
index file, File Management and the Index, A Detailed View of Git’s Object Model and Files
locating conflicted, Locating Conflicted Files
moving functions between, Atomic Changesets
pathnames, Pathname Versus Content
removing, Removing and Renaming Files in Your Repository, Using git rm
renaming, Removing and Renaming Files in Your Repository, A Note on Tracking Renames
staging, Using git add
tracking, Git Tracks Content, Using git add
using, Files and Trees
find, Inside the .git directory
git find command, Inside the .git directory
finding, Finding Commits, Using Pickaxe
commits, Finding Commits, Using Pickaxe
--first-parent option (git log command; gitk command), Squash Merges
forking, Forking Projects, Reconciling forks
projects, Forking Projects, Reconciling forks
format-patch, Generating Patches, Patches and Topological Sorts, Mailing Patches, Applying Patches
git format-patch command, Generating Patches, Patches and Topological Sorts, Mailing Patches, Applying Patches
forward porting, Rebasing Commits, The merge or rebase step
forward slash (/), The .gitignore File, Dos and Don’ts in Branch Names, gitlinks
Freedesktop.org, Repository Structure Examples
functions, Atomic Changesets
moving from one file to another, Atomic Changesets

G

gatekeeper repositories, Cloning All the Branches
generating, Generating Patches, Patches and Topological Sorts
patches, Generating Patches, Patches and Topological Sorts
Gentoo Linux distribution, Other Binary Distributions
installing Git, Other Binary Distributions
getting, Getting Repository Updates, The merge or rebase step
repository updates, Getting Repository Updates, The merge or rebase step
Git, The Birth of Git, Time Line, What’s in a Name?, Quick Introduction to Using Git, Making a Copy of Your Repository, Basic Concepts, Pathname Versus Content, Git Concepts at Work, Tags, Comparing How Subversion and Git Derive diffs
basic concepts, Basic Concepts, Pathname Versus Content, Git Concepts at Work, Tags
deriving diffs compared Subversion, Comparing How Subversion and Git Derive diffs
history, The Birth of Git, Time Line
naming, What’s in a Name?
quick introduction, Quick Introduction to Using Git, Making a Copy of Your Repository
git add command, Adding a File to Your Repository, Adding a File to Your Repository, Using git add, Using git add, A Detailed View of Git’s Object Model and Files, Finishing Up a Conflict Resolution
git am command, Applying Patches, Patch-Related Hooks
git apply command, Applying Patches
Git Bash command, Installing Standalone Git (msysGit)
git bisect command, Using git bisect, Using git bisect, Squash Merges
git bisect replay command, Using git bisect
git bisect visualize command, Using git bisect
git blame command, Using git blame, Squash Merges
git branch command, Creating Branches, Deleting Branches
git check-ref-format command, Dos and Don’ts in Branch Names
git checkout command, Checking Out Branches, Detached HEAD Branches, How Git Keeps Track of Conflicts, reset, revert, and checkout
git cherry-pick command, Using git cherry-pick
git clone command, Making a Copy of Your Repository, Repositories, Bare and Development Repositories, Creating an Authoritative Repository, Cloning a Repository, Hooks, The Automated Solution: Checking Out Subprojects Using Custom Scripts, gitlinks
git command, The Git Command Line
git commit command, Commits, It’s All About the Index, Using git commit --all, A Detailed View of Git’s Object Model and Files, Changing the Top Commit, Changing the Top Commit, Commit-Related Hooks
git config command, Configuring the Commit Author, Configuration Files, git config
git diff command, Viewing Commit Differences, It’s All About the Index, Viewing Old Commits, Diffs, Comparing How Subversion and Git Derive diffs, A Merge with a Conflict, git diff with conflicts, git diff with conflicts, Generating Patches, Importing Subprojects with git pull -s subtree
.git directory, Inside the .git directory
contents, Inside the .git directory
Git Directory, refs and symrefs
names, refs and symrefs
git fetch command, The refspec, Fetching the Alternate History
.git files, Inside the .git directory
.git file extension, refs and symrefs
git find command, Inside the .git directory
git format-patch command, Generating Patches, Patches and Topological Sorts, Mailing Patches, Applying Patches
git hash-object command, Using git add
git init command, Creating an Initial Repository, Adding a File to Your Repository, Inside the .git directory
git log, git log with conflicts
conflicts, git log with conflicts
git log command, Viewing Your Commits, Viewing Old Commits, Commit Ranges, Using Pickaxe, git diff and Commit Ranges, Merging Two Branches, git log with conflicts, Finishing Up a Conflict Resolution
git ls-files command, Using git add, Locating Conflicted Files, How Git Keeps Track of Conflicts
git merge command, Merging Two Branches, Fetching Before Committing
git merge-base command, Using gitk to view the commit graph, Using Branches, Merge Strategies
git mv command, Removing and Renaming Files in Your Repository, Using git mv
Git native protocol, Referring to Remote Repositories
Git object model, The Birth of Git, A Detailed View of Git’s Object Model and Files, Merges and Git’s Object Model
about, A Detailed View of Git’s Object Model and Files
importance of, The Birth of Git
merges, Merges and Git’s Object Model
git pull command, Applying Merge Strategies, Getting Repository Updates, Why Use Patches?, Importing Subprojects with git pull -s subtree, Importing Subprojects with git pull -s subtree, Importing Subprojects with git pull -s subtree, Importing Subprojects with git pull -s subtree, Merging Back into Subversion
git push command, The refspec, Pushing Your Changes, Non-Fast-Forward Pushes, Non-Fast-Forward Pushes, Pushing a Merged History, Bare Repositories and git push, Push-Related Hooks
git rebase command, Rebasing Commits, rebase Versus merge, Getting Repository Updates, Changing Public History, Fetching Before Committing
git reflog command, Deleting Branches
git remote command, Remotes, Make Your Own origin Remote, git remote
git reset command, Using git reset, Using git reset, reset, revert, and checkout
git rev-list command, Commit Ranges, Generating Patches
git rev-parse command, refs and symrefs, Relative Commit Names, Using git reset, Pushing Your Changes
git revert command, Using git revert, reset, revert, and checkout
git rm command, Removing and Renaming Files in Your Repository, Using git rm
git send-email command, Mailing Patches, Mailing Patches
git show command, Viewing Your Commits, Commits, Viewing Old Commits, Finishing Up a Conflict Resolution
git show-branch command, Viewing Your Commits, Relative Commit Names, Viewing Branches
git show-ref command, The refspec
git status command, File Classifications in Git, Locating Conflicted Files
git svn clone command, Example: A Shallow Clone of a Single Branch
git svn command, Pushing, Pulling, Branching, and Merging with git svn, How dcommit handles merges, Reconstructing the git-svn cache
git svn dcommit command, Merging Back into Subversion
git svn rebase command, Committing Through git svn rebase
git symbolic-ref command, refs and symrefs
git tag command, Tags
git write-tree command, Files and Trees, Commits
git-daemon, Repositories with Anonymous Read Access, Publishing using Git and HTTP daemons
git-daemon-run, Debian/Ubuntu
git-email, Debian/Ubuntu
git-svn, Debian/Ubuntu
git-svn cache, Reconstructing the git-svn cache, Reconstructing the git-svn cache
.git/config file, Configuration Files
.gitignore versus svn:ignore, svn:ignore Versus .gitignore
.gitignore files, File Classifications in Git, The .gitignore File
gitk command, Using gitk to view the commit graph
gitlinks, The Native Solution: gitlinks and git submodule, The git submodule Command
combining projects, The Native Solution: gitlinks and git submodule, The git submodule Command
gitweb, Debian/Ubuntu
--global option (git config command), Configuration Files
globally unique identifiers, Content-Addressable Names
SHA1, Content-Addressable Names
globbing, The .gitignore File
--graph option (git log command), Merging Two Branches
graphs, Commit Graphs, Using gitk to view the commit graph, Commit Ranges, Patches and Topological Sorts
commit graphs, Commit Graphs, Using gitk to view the commit graph
reachability, Commit Ranges
topological sort, Patches and Topological Sorts

H

--hard option (git reset command), Using git reset, reset, revert, and checkout
hash-object, Using git add
git hash-object command, Using git add
hashes, Objects, Hashes, and Blobs, Objects, Hashes, and Blobs, A Note on Git’s Use of SHA1, Identifying Commits
SHA1, Objects, Hashes, and Blobs, A Note on Git’s Use of SHA1, Identifying Commits
using, Objects, Hashes, and Blobs
HEAD, Using git bisect (see detached HEAD)
HEAD branches, detached, Detached HEAD Branches
HEAD symref, refs and symrefs
“Hello World” example, Inside the .git directory, Tree Hierarchies, Finishing Up a Conflict Resolution
hierarchies, Tree Hierarchies
trees, Tree Hierarchies
history, Viewing Old Commits, Commit Ranges, Viewing Old Commits, Caution About Altering History, Alternate Histories, Fetching the Alternate History, Merging Histories, Changing Public History, No One True History, Patching Versus Merging
altering, Caution About Altering History
alternate, Alternate Histories
changing public history, Changing Public History
commits, Viewing Old Commits, Commit Ranges
distributed version control, No One True History
fetching, Fetching the Alternate History
fetching and merging branches, Patching Versus Merging
merging, Merging Histories
range, Viewing Old Commits
history ambivalence, No One True History
history of Git, The Birth of Git, Time Line
hooks, Hooks, Other Local Repository Hooks, Installing Hooks, Creating Your First Hook, Available Hooks, Other Local Repository Hooks
installing, Installing Hooks, Creating Your First Hook
types of, Available Hooks, Other Local Repository Hooks
HTTP, Patches
compared to Git’s native transfer protocol, Patches
HTTP and HTTPS URLs, Referring to Remote Repositories
HTTP daemon, Publishing repositories using an HTTP daemon
hyphen, The Git Command Line (see - (minus sign))

I

-i option (git rebase command), Using git rebase -i, Using git rebase -i
identifying, Identifying Commits, Relative Commit Names
commits, Identifying Commits, Relative Commit Names
Identifying Commits, Relative Commit Names
relative, Relative Commit Names
IDs, What’s in a Name?, Content-Addressable Names
(see also commit IDs; names)
SHA1, Content-Addressable Names
--ignore-all-space option (git diff command), Forms of the git diff Command
ignored files, File Classifications in Git
immutability, The Birth of Git
importing, The Obvious Solution: Import the Code into Your Project, Submitting Your Changes Upstream, Importing Subprojects with git pull -s subtree, Importing Subprojects with git pull -s subtree
code into projects, The Obvious Solution: Import the Code into Your Project, Submitting Your Changes Upstream
subprojects with git pull command, Importing Subprojects with git pull -s subtree, Importing Subprojects with git pull -s subtree
index, Repositories, Index, File Management and the Index, A Detailed View of Git’s Object Model and Files, It’s All About the Index, File Classifications in Git, Using git add, Using git commit --all, Using git rm, Preparing for a Merge, How Git Keeps Track of Conflicts
about, Index, It’s All About the Index
defined, Repositories
dirty, Preparing for a Merge
file classifications, File Classifications in Git
git add command, Using git add
git commit command, Using git commit --all
git rm command, Using git rm
tracking conflicts, How Git Keeps Track of Conflicts
inetd, Publishing Repositories Using git-daemon
init, Creating an Initial Repository, Adding a File to Your Repository, Inside the .git directory
git init command, Creating an Initial Repository, Adding a File to Your Repository, Inside the .git directory
inline, Mailing Patches
patches, Mailing Patches
inspecting conflicts, Inspecting Conflicts
installing Git, Installing Git, Installing Standalone Git (msysGit), Using Linux Binary Distributions, Other Binary Distributions, Obtaining a Source Release, Building and Installing, Installing Git on Windows, Installing Standalone Git (msysGit)
on Linux, Using Linux Binary Distributions, Other Binary Distributions
using source releases, Obtaining a Source Release, Building and Installing
on Windows, Installing Git on Windows, Installing Standalone Git (msysGit)
installing hooks, Installing Hooks, Creating Your First Hook
integrity, The Birth of Git
of VCS, The Birth of Git
--interactive option (git add command; git commit command), Using git add

K

KDE project, The Old Solution: Partial Checkouts

L

-l option, Configuration Files
(git config command), Configuration Files
left (<), git log with conflicts
-left-right option(git log command), git log with conflicts
lifetime, Creating Branches
branches, Creating Branches
lightweight tags, Tags
defined, Tags
linearization, rebase Versus merge, No One True History, Patches and Topological Sorts, Patching Versus Merging
commits, rebase Versus merge, No One True History, Patches and Topological Sorts, Patching Versus Merging
Linux, Using Linux Binary Distributions, Other Binary Distributions
installing Git on binary distributions, Using Linux Binary Distributions, Other Binary Distributions
Linux Kernel project, The Birth of Git, The Birth of Git, Time Line, Applying Merge Strategies
Linux kernel project, Repository Structure Examples, Repository Structure Examples, No One True History, Using Multiple Upstream Repositories, Reconciling forks, Combining Projects
listing, Listing Branch Names
branch names, Listing Branch Names
local repository, Remotes
defined, Remotes
locks, Precedents
CVS, Precedents
log, Viewing Your Commits, Viewing Old Commits, Commit Ranges, Using Pickaxe, git diff and Commit Ranges, Merging Two Branches, Finishing Up a Conflict Resolution
git log command, Viewing Your Commits, Viewing Old Commits, Commit Ranges, Using Pickaxe, git diff and Commit Ranges, Merging Two Branches, Finishing Up a Conflict Resolution
log messages, Adding a File to Your Repository
logs, Viewing Old Commits, git log with conflicts
git log, Viewing Old Commits, git log with conflicts
long form options (git command), The Git Command Line
ls-files, Using git add, Locating Conflicted Files, How Git Keeps Track of Conflicts
git ls-files command, Using git add, Locating Conflicted Files, How Git Keeps Track of Conflicts

M

-m option (git checkout command), Merging Changes into a Different Branch
--M option (git diff command), Forms of the git diff Command
mail transfer agent (MTA), Mailing Patches
mail user agent (MUA), Mailing Patches
maintainer role, Distributed Repository Structure, The Maintainer and Developer Roles
master branch, Branch Names, Using Branches
Mercurial, Precedents
merge commits, Relative Commit Names, Commit Graphs, Commit Graphs, Using gitk to view the commit graph, Viewing Branches, Merging Changes into a Different Branch, Merging Two Branches, A Merge with a Conflict, A Merge with a Conflict, Finishing Up a Conflict Resolution, Finishing Up a Conflict Resolution, Aborting or Restarting a Merge, Merge Strategies, Degenerate Merges, Octopus merges, reset, revert, and checkout, Merging Histories, No One True History, Role Duality, Generating Patches, Generating Patches, Importing Subprojects with git pull -s subtree, Pushing, Pulling, Branching, and Merging with git svn, Merging Back into Subversion, How dcommit handles merges
aborting or restarting merges, Aborting or Restarting a Merge
commit graphs, Commit Graphs
conflict resolution, Finishing Up a Conflict Resolution
degenerate merges, Degenerate Merges
git add, A Merge with a Conflict
gitk, Using gitk to view the commit graph
graphs, Commit Graphs
merging histories, Merging Histories
merging into different branches, Merging Changes into a Different Branch
octopus merges, Octopus merges
patches, Generating Patches
push and pull, Role Duality
relative commit names, Relative Commit Names
viewing branches, Viewing Branches
merge drivers, Merge Drivers
--merge option (git log command), git log with conflicts
merge step, The merge or rebase step
remote repositories, The merge or rebase step
merge-base, Merge Strategies
git merge-base command, Merge Strategies
merges, Using Branches, Merging Changes into a Different Branch, Merges, Why Not Just Merge Each Change One by One?, Merge Examples, A Merge with a Conflict, A Merge with a Conflict, Aborting or Restarting a Merge, Merge Strategies, Merge Drivers, Merges and Git’s Object Model, rebase Versus merge, rebase Versus merge, Merging Histories, Merge Conflicts, Applying Patches, Patching Versus Merging, Committing Through git svn rebase, Pushing, Pulling, Branching, and Merging with git svn, How dcommit handles merges, Merging Back into Subversion, How dcommit handles merges
and branches, Using Branches
conflicts, A Merge with a Conflict, Aborting or Restarting a Merge, Merge Conflicts
examples, Merge Examples, A Merge with a Conflict
Git object model, Merges and Git’s Object Model
git svn command, Pushing, Pulling, Branching, and Merging with git svn, How dcommit handles merges
history, Merging Histories
merging changes into different branches, Merging Changes into a Different Branch
strategies for, Merge Strategies, Merge Drivers
Subversion, Merging Back into Subversion
svn dcommit, How dcommit handles merges
three-way merges, Applying Patches
versus patches, Patching Versus Merging
versus rebase, rebase Versus merge, rebase Versus merge, Committing Through git svn rebase
MERGE_HEAD symref, refs and symrefs
messages, Adding a File to Your Repository, Adding a File to Your Repository, Writing Commit Log Messages
commit log messages, Writing Commit Log Messages
error messages, Adding a File to Your Repository
log messages, Adding a File to Your Repository
metadata, Git Object Types
in object types, Git Object Types
minus sign, The Git Command Line (see -)
--mixed option (git reset command), Using git reset
Monotone, Precedents
--more option (git show-branch command), Viewing Your Commits, Viewing Branches
moving, Atomic Changesets
functions from one file to another, Atomic Changesets
msysGit, Installing Git on Windows, Installing Standalone Git (msysGit)
about, Installing Git on Windows
installing on Windows, Installing Standalone Git (msysGit)
MTA (mail transfer agent), Mailing Patches
MUA (mail user agent), Mailing Patches
multiple repositories, Your Own Workspace, Reconciling forks, Your Own Workspace, Where to Start Your Repository, Converting to a Different Upstream Repository, Using Multiple Upstream Repositories, Forking Projects, Reconciling forks
converting to a different upstream repository, Converting to a Different Upstream Repository
forking projects, Forking Projects, Reconciling forks
starting repositories, Where to Start Your Repository
using, Using Multiple Upstream Repositories
workspace, Your Own Workspace
mutt, Mailing Patches
importing mbox mail folders, Mailing Patches
mv, Removing and Renaming Files in Your Repository, Using git mv
git mv command, Removing and Renaming Files in Your Repository
using git mv command, Using git mv

N

names, What’s in a Name?, Adding a File to Your Repository, Viewing Commit Differences, Content-Addressable Names, Pathname Versus Content, Identifying Commits, Absolute Commit Names, Absolute Commit Names, refs and symrefs, refs and symrefs, refs and symrefs, Relative Commit Names, Branch Names, Using Branches, Listing Branch Names, Tracking Branches
absolute commit names, Absolute Commit Names
author name error message, Adding a File to Your Repository
branches, refs and symrefs, Branch Names, Using Branches, Listing Branch Names
commits, Identifying Commits
content-addressable names, Content-Addressable Names
Git, What’s in a Name?
Git Directory, refs and symrefs
pathnames versus content, Pathname Versus Content
relative commit names, Relative Commit Names
remote tracking branches, Tracking Branches
revisions, Viewing Commit Differences
symrefs, refs and symrefs
tags, Absolute Commit Names
--no-ff option (git svn dcommit command), Degenerate Merges, Merging Back into Subversion
non-fast-forward push problem, Non-Fast-Forward Pushes
normal merges, Normal Merges

O

-o directory option (git format-patch command), Mailing Patches
object stores, Repositories, Content-Addressable Names, Git Tracks Content
about, Content-Addressable Names
content tracking, Git Tracks Content
defined, Repositories
objects, Git Object Types, Git Object Types, Object Store Pictures, Objects, Hashes, and Blobs, A Note on Git’s Use of SHA1, A Detailed View of Git’s Object Model and Files, Merges and Git’s Object Model
(see also blobs; circles; trees)
comparing, A Note on Git’s Use of SHA1
Git object model, A Detailed View of Git’s Object Model and Files, Merges and Git’s Object Model
types of, Git Object Types
using, Objects, Hashes, and Blobs
working together, Object Store Pictures
octopus merges, Normal Merges, Octopus merges
octothorp, A Merge with a Conflict (see # (pound sign))
--onto option (git rebase command), Rebasing Commits
options, The Git Command Line
git command, The Git Command Line
--origin option (git clone command), Repository Clones
ORIG_HEAD symref, refs and symrefs
ours merges, Specialty Merges, Applying Merge Strategies
--ours option (git diff command), git diff with conflicts

P

-p option (git log command), git log with conflicts
packages, Debian/Ubuntu, Other Binary Distributions
on Debian/Ubuntu systems, Debian/Ubuntu
other Linux distributions, Other Binary Distributions
Packard, Keith, Repository Structure Examples
on xorg and Git, Repository Structure Examples
parent commits, Commits, Relative Commit Names
defined, Relative Commit Names
using, Commits
partial checkouts, The Old Solution: Partial Checkouts
patches, Patches, Patching Versus Merging, Patches, Why Use Patches?, Generating Patches, Patches and Topological Sorts, Mailing Patches, Applying Patches, Applying Patches, Bad Patches, Patching Versus Merging, Patch-Related Hooks, Committing Through git svn rebase
applying, Applying Patches, Applying Patches
bad patches, Bad Patches
commands for exchanging data, Patches
emailing, Mailing Patches
generating, Generating Patches, Patches and Topological Sorts
hooks, Patch-Related Hooks
purpose, Why Use Patches?
rebase, Committing Through git svn rebase
versus merges, Patching Versus Merging
path limiting, git diff with Path Limiting
git diff command, git diff with Path Limiting
pathnames, Pathname Versus Content, Using git mv
git mv, Using git mv
versus content, Pathname Versus Content
patterns, The .gitignore File
.gitignore pattens and filenames, The .gitignore File
peer-to-peer backups, No One True History
peer-to-peer model, Precedents, Bare Repositories and git push, The Shared Repository Structure, Converting to a Different Upstream Repository, Why Use Patches?
using patches, Why Use Patches?
pickaxe, Using Pickaxe, git diff with Path Limiting
defined, Using Pickaxe
git diff command, git diff with Path Limiting
pictures of remote repository operations, Remote Repository Operations in Pictures, Pushing a Merged History
plus sign, Viewing Branches (see +)
post hooks, Hooks
defined, Hooks
post-applypatch hook, Patch-Related Hooks
post-checkout hook, Other Local Repository Hooks
post-commit hook, Commit-Related Hooks
post-merge hook, Other Local Repository Hooks
post-receive hook, Push-Related Hooks
post-update hook, Push-Related Hooks
pound sign, The .gitignore File (see #)
PowerPC, Converting to a Different Upstream Repository
pre hooks, Hooks
defined, Hooks
pre-applypatch hook, Patch-Related Hooks
pre-auto-gc hook, Other Local Repository Hooks
pre-commit hook, Commit-Related Hooks
pre-rebase hook, Other Local Repository Hooks
pre-receive hook, Push-Related Hooks
--prefix=svn/ option (git svn command), Cloning All the Branches
--preserve-merges option (git rebase command), rebase Versus merge
--pretty option (git show command), Commits, Viewing Old Commits
projects, Forking Projects, Reconciling forks, Combining Projects, The git submodule Command, The Obvious Solution: Import the Code into Your Project, Submitting Your Changes Upstream
combining, Combining Projects, The git submodule Command
forking, Forking Projects, Reconciling forks
importing code, The Obvious Solution: Import the Code into Your Project, Submitting Your Changes Upstream
publishers, Role Duality
roles and dataflows, Role Duality
publishing, Using Branches, Publishing Repositories, Repositories with Anonymous Write Access, Separate Commit and Publish Steps
branches, Using Branches
and distributed version control, Separate Commit and Publish Steps
repositories, Publishing Repositories, Repositories with Anonymous Write Access
pull, Getting Repository Updates, Importing Subprojects with git pull -s subtree, Importing Subprojects with git pull -s subtree, Pushing, Pulling, Branching, and Merging with git svn, How dcommit handles merges
git pull command, Getting Repository Updates, Importing Subprojects with git pull -s subtree, Importing Subprojects with git pull -s subtree
git svn command, Pushing, Pulling, Branching, and Merging with git svn, How dcommit handles merges
push, The refspec, Pushing Your Changes, Non-Fast-Forward Pushes, Non-Fast-Forward Pushes, Pushing a Merged History, Bare Repositories and git push, Push-Related Hooks
git push command, The refspec, Pushing Your Changes, Non-Fast-Forward Pushes, Non-Fast-Forward Pushes, Pushing a Merged History, Bare Repositories and git push
hooks, Push-Related Hooks
pushing, Pushing, Pulling, Branching, and Merging with git svn, How dcommit handles merges
git svn command, Pushing, Pulling, Branching, and Merging with git svn, How dcommit handles merges

R

-r option (git diff command), Diffs
range, Viewing Old Commits
history, Viewing Old Commits
ranges, Commit Ranges, Commit Ranges, git diff and Commit Ranges, git diff and Commit Ranges, Generating Patches
commits, Commit Ranges, Commit Ranges, git diff and Commit Ranges, git diff and Commit Ranges, Generating Patches
RCS (Revision Control System), Background, Precedents
defined, Background
reachability, Commit Ranges
graphs, Commit Ranges
read access, anonymous, Repositories with Anonymous Read Access, Publishing using Git and HTTP daemons
rebase, Rebasing Commits, rebase Versus merge, Changing Public History, Committing Through git svn rebase, Committing Through git svn rebase
committing through git svn rebase, Committing Through git svn rebase
git rebase command, Rebasing Commits, rebase Versus merge, Changing Public History
versus merge, Committing Through git svn rebase
--rebase option (git pull command), Getting Repository Updates
rebase step, The merge or rebase step
remote repositories, The merge or rebase step
recovering branches, Deleting Branches
recursive merges, Normal Merges, Recursive merges, Applying Merge Strategies
referencing, Referencing Other Repositories, The refspec
repositories, Referencing Other Repositories, The refspec
reflog, Deleting Branches, Using git reset, Bare and Development Repositories
git reflog command, Deleting Branches, Using git reset
refs, refs and symrefs
and symrefs (symbolic references), refs and symrefs
refspecs, The refspec, The merge or rebase step, Adding and Deleting Remote Branches
about, The refspec
merging branches, The merge or rebase step
syntax, Adding and Deleting Remote Branches
relative commit names, Relative Commit Names
remote, Remotes, Example Using Remote Repositories, The merge or rebase step, Make Your Own origin Remote, Make Your Own origin Remote, Remote Configuration, git remote
configuration, Remote Configuration
example, Example Using Remote Repositories, The merge or rebase step
git remote command, Remotes, Make Your Own origin Remote, git remote
origin, Make Your Own origin Remote
remote origin, Example Using Remote Repositories
depot directory, Example Using Remote Repositories
remote repositories, Remote Repositories, Repositories with Anonymous Write Access, Bare and Development Repositories, The refspec, Remotes, Referencing Other Repositories, The refspec, Remote Repository Operations in Pictures, Pushing a Merged History, Adding and Deleting Remote Branches, Bare Repositories and git push, Publishing Repositories, Repositories with Anonymous Write Access
about, Bare and Development Repositories, The refspec
adding and deleting remote branches, Adding and Deleting Remote Branches
bare repositories and git push command, Bare Repositories and git push
defined, Remotes
publishing, Publishing Repositories, Repositories with Anonymous Write Access
referencing repositories, Referencing Other Repositories, The refspec
visualizing with pictures, Remote Repository Operations in Pictures, Pushing a Merged History
remote tracking branches, refs and symrefs, Listing Branch Names, Tracking Branches
remote update, Make Your Own origin Remote
removing, Removing and Renaming Files in Your Repository, Using git rm
files, Using git rm
files in repositories, Removing and Renaming Files in Your Repository
renaming, Removing and Renaming Files in Your Repository, A Note on Tracking Renames, A Note on Tracking Renames
files, Removing and Renaming Files in Your Repository, A Note on Tracking Renames
tracking, A Note on Tracking Renames
repositories, The Birth of Git, Creating an Initial Repository, Adding a File to Your Repository, Removing and Renaming Files in Your Repository, Repositories, Repositories, Bare and Development Repositories, The refspec, Bare and Development Repositories, Bare and Development Repositories, Publishing Repositories, Repositories with Anonymous Write Access, The Shared Repository Structure, Repository Structure Examples, The Shared Repository Structure, Hooks, Cloning All the Branches, Sharing Your Repository
(see also clones; distributed repositories; remote repositories)
about, Repositories, Bare and Development Repositories, The refspec
adding files, Adding a File to Your Repository
bare repositories, Bare and Development Repositories
completeness of, The Birth of Git
development repositories, Bare and Development Repositories
gatekeeper repositories, Cloning All the Branches
publishing, Publishing Repositories, Repositories with Anonymous Write Access
removing and renaming files, Removing and Renaming Files in Your Repository
replicating collections of hooks, Hooks
shared repositories, The Shared Repository Structure, Sharing Your Repository
structure, The Shared Repository Structure, Repository Structure Examples
working, Creating an Initial Repository
reset, Using git reset, Using git reset, reset, revert, and checkout
git reset command, Using git reset, Using git reset, reset, revert, and checkout
resolve merges, Normal Merges, Applying Merge Strategies
restarting merges, Aborting or Restarting a Merge
(see also git bisect command)
rev-list, Generating Patches
git rev-list command, Generating Patches
rev-parse, refs and symrefs, Relative Commit Names, Using git reset, Pushing Your Changes
git rev-parse command, refs and symrefs, Relative Commit Names, Using git reset, Pushing Your Changes
revert, Using git revert, reset, revert, and checkout
git revert command, Using git revert, reset, revert, and checkout
Revision Control System (RCS), Background, Precedents
defined, Background
revisions, Viewing Commit Differences
names, Viewing Commit Differences
right (>), git log with conflicts
rm, Removing and Renaming Files in Your Repository, Using git rm
git rm command, Removing and Renaming Files in Your Repository, Using git rm
--root option (git format-patch command), Generating Patches
rsync protocol, Referring to Remote Repositories

S

-S option (git log command), Using Pickaxe, git diff with Path Limiting
(see also pickaxe)
-s option (git ls-files command), How Git Keeps Track of Conflicts
-s subtree option (git pull command), Importing Subprojects with git pull -s subtree
scaling, The Birth of Git, Branch Names
branch names and, Branch Names
of VCS, The Birth of Git
SCCS (Source Code Control System), Precedents
SCM (source code manager), Background
defined, Background
scripts, Hooks, Installing Hooks, The Automated Solution: Checking Out Subprojects Using Custom Scripts
checking out subprojects, The Automated Solution: Checking Out Subprojects Using Custom Scripts
hook scripts, Hooks, Installing Hooks
send-email, Mailing Patches, Mailing Patches, Mailing Patches
configuration options, Mailing Patches
git send-email command, Mailing Patches, Mailing Patches
SHA1 (Secure Hash Function), The Birth of Git, Content-Addressable Names, Objects, Hashes, and Blobs, A Note on Git’s Use of SHA1, Using git add, Commits
amending files, Using git add
efficiency, Commits
uniqueness and collisions, Objects, Hashes, and Blobs
using, A Note on Git’s Use of SHA1
values, Content-Addressable Names
shared repositories, The Shared Repository Structure, Sharing Your Repository
short form options (git command), The Git Command Line
show, Viewing Your Commits, Commits, Viewing Old Commits, Finishing Up a Conflict Resolution
git show command, Viewing Your Commits, Commits, Viewing Old Commits, Finishing Up a Conflict Resolution
show-branch, Viewing Your Commits, Relative Commit Names, Viewing Branches
git show-branch command, Viewing Your Commits, Relative Commit Names, Viewing Branches
--skip option (git rebase command), Rebasing Commits
slash, gitlinks (see / (forward slash))
SMTP, Mailing Patches, Mailing Patches
configuration options, Mailing Patches
open relay servers, Mailing Patches
snapshots, Git Object Types, Commits, Checking Out Branches, Comparing How Subversion and Git Derive diffs, Repository Structure Examples
--soft option (git reset command), Using git reset
Source Code Control System (SCCS), Precedents
source code manager (SCM), Background
defined, Background
source releases, Obtaining a Source Release, Building and Installing
installing Git, Obtaining a Source Release, Building and Installing
squash merges, Squash Merges
--squash option (git merge command; git pull commands), Squash Merges
staging, Index, File Management and the Index, Using git add
about, File Management and the Index
changes to index, Index
files, Using git add
start points, Using gitk to view the commit graph, Where to Start Your Repository
branches, Using gitk to view the commit graph
repositories, Where to Start Your Repository
--stat option (git log command; git diff command), Viewing Old Commits, Forms of the git diff Command
status, File Classifications in Git, Using git add, Locating Conflicted Files
files, Using git add
git status command, File Classifications in Git, Locating Conflicted Files
--stdlayout option (git svn command), Cloning All the Branches
subcommands, The Git Command Line
git command, The Git Command Line
submitting, Submitting Your Changes Upstream
project changes upstream, Submitting Your Changes Upstream
submodules, Combining Projects, The Native Solution: gitlinks and git submodule, The git submodule Command
about, Combining Projects
subprojects, Importing Subprojects by Copying, Importing Subprojects with git pull -s subtree, Importing Subprojects with git pull -s subtree, The Automated Solution: Checking Out Subprojects Using Custom Scripts
checking out using scripts, The Automated Solution: Checking Out Subprojects Using Custom Scripts
importing by copying, Importing Subprojects by Copying
importing with git pull command, Importing Subprojects with git pull -s subtree, Importing Subprojects with git pull -s subtree
subtrees, Specialty Merges, Applying Merge Strategies
merges, Specialty Merges, Applying Merge Strategies
SVN (Subversion), Precedents, A Note on Tracking Renames, Comparing How Subversion and Git Derive diffs, Using Git with Subversion Repositories, Reconstructing the git-svn cache, Pushing, Pulling, Branching, and Merging with git svn, How dcommit handles merges, Reconstructing the git-svn cache
deriving diffs compared Git, Comparing How Subversion and Git Derive diffs
git svn command, Pushing, Pulling, Branching, and Merging with git svn, How dcommit handles merges, Reconstructing the git-svn cache
tracking renames, A Note on Tracking Renames
using Git with, Using Git with Subversion Repositories, Reconstructing the git-svn cache
svn clone, Example: A Shallow Clone of a Single Branch
git svn clone command, Example: A Shallow Clone of a Single Branch
svn dcommit, Merging Back into Subversion
git svn dcommit command, Merging Back into Subversion
svn rebase, Committing Through git svn rebase
git svn rebase command, Committing Through git svn rebase
svn:ignore versus .gitignore, svn:ignore Versus .gitignore
symbolic-ref, refs and symrefs
git symbolic-ref command, refs and symrefs
symmetric differences, Commit Ranges
symrefs (symbolic references), refs and symrefs
and refs, refs and symrefs

T

tags, Git Object Types, Object Store Pictures, Tags, Absolute Commit Names, Reasons for Using Branches
about, Git Object Types
names, Absolute Commit Names
pictures of, Object Store Pictures
using, Tags
versus branches, Reasons for Using Branches
temporary files, File Classifications in Git
text merge driver, Merge Drivers
--theirs option (git diff command), git diff with conflicts
three-way merges, Applying Patches
tilde (~), Relative Commit Names
top commits, Changing the Top Commit, Changing the Top Commit
changing, Changing the Top Commit, Changing the Top Commit
topic branches, Reasons for Using Branches
defined, Reasons for Using Branches
topological order, Patches and Topological Sorts, Patches and Topological Sorts
git format-patch command, Patches and Topological Sorts
patches, Patches and Topological Sorts
Torvalds, Linus, Background, It’s All About the Index, No One True History, Reconciling forks
creating Git, Background
on backups, No One True History
on forks, Reconciling forks
on the index, It’s All About the Index
tracking, Git Tracks Content, Git Tracks Content, File Classifications in Git, Using git add, A Note on Tracking Renames, How Git Keeps Track of Conflicts, Tracking Branches
branches, Tracking Branches
conflicts, How Git Keeps Track of Conflicts
content, Git Tracks Content, Git Tracks Content
file renames, A Note on Tracking Renames
files, File Classifications in Git, Using git add
tracking branches, Remote Repositories
remote repositories, Remote Repositories
transfer protocols, Patches
transient files, File Classifications in Git
trees, Git Object Types, Object Store Pictures, Files and Trees, Tree Hierarchies, Diffs
about, Git Object Types
hierarchies, Tree Hierarchies
pictures of, Object Store Pictures
tree objects and diffs, Diffs
using, Files and Trees
triple dots (…), Commit Ranges, git diff and Commit Ranges
trust, The Birth of Git
of VCS, The Birth of Git
types, Git Object Types
of objects, Git Object Types

U

-u option (git diff command), Diffs
Ubuntu Linux, Debian/Ubuntu
installing Git, Debian/Ubuntu
uncommitted changes, Checking Out When You Have Uncommitted Changes
checking out branches, Checking Out When You Have Uncommitted Changes
unified diffs, Diffs
Uniform Resource Locator (URL), Referring to Remote Repositories
remote repositories, Referring to Remote Repositories
union merge driver, Merge Drivers
untracked files, File Classifications in Git
update hooks, Push-Related Hooks
updates, Getting Repository Updates, The merge or rebase step
repositories, Getting Repository Updates, The merge or rebase step
upstream consumers, Role Duality
upstream flows, Upstream and Downstream Flows
distributed repositories, Upstream and Downstream Flows
upstream publishers, Role Duality
upstream repositories, Role Duality, Converting to a Different Upstream Repository
converting to different upstream repositories, Converting to a Different Upstream Repository
transferring between upstream and downstream repositories, Role Duality
URL (Uniform Resource Locator), Referring to Remote Repositories
remote repositories, Referring to Remote Repositories
user identification, Example: A Shallow Clone of a Single Branch
SVN versus Git, Example: A Shallow Clone of a Single Branch

V

values, Content-Addressable Names
SHA1, Content-Addressable Names
VCS (version control system), Background, The Birth of Git
defined, Background
limitations of, The Birth of Git
viewing, Viewing Your Commits, Viewing Commit Differences, Configuration Files, Viewing Old Commits, Viewing Old Commits, Viewing Branches
branches, Viewing Branches
commit differences, Viewing Commit Differences
commits, Viewing Your Commits, Viewing Old Commits, Viewing Old Commits
configuration files, Configuration Files

W

-w option (git diff command), Forms of the git diff Command
wildcards, The .gitignore File, Branch Names
branch names, Branch Names
globbing, The .gitignore File
Windows, Installing Git on Windows, Installing Standalone Git (msysGit)
installing Git, Installing Git on Windows, Installing Standalone Git (msysGit)
working directory, Creating an Initial Repository
defined, Creating an Initial Repository
workspace, Your Own Workspace
multiple repositories, Your Own Workspace
write access, anonymous, Repositories with Anonymous Write Access
write-tree, Files and Trees, Commits
git write-tree command, Files and Trees, Commits
writing, Writing Commit Log Messages
commit log messages, Writing Commit Log Messages

X

X.org project, Repository Structure Examples
xinetd, Publishing Repositories Using git-daemon
..................Content has been hidden....................

You can't read the all page of ebook, please click here login for view all page.
Reset
3.23.101.63