blob: 8bcfe224b064010e6b661ef914d8c56829d857b4 [file] [log] [blame]
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<!DOCTYPE ncx
PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1"><head><meta name="cover" content="cover"/><meta name="dtb:uid" content="_d0e1"/></head><docTitle><text>Distributed Version Control with Git</text></docTitle><navMap><navPoint id="d0e1" playOrder="1"><navLabel><text>Distributed Version Control with Git</text></navLabel><content src="index.html"/><navPoint id="d0e40" playOrder="2"><navLabel><text>Foreword</text></navLabel><content src="pr01.html"/></navPoint><navPoint id="d0e55" playOrder="3"><navLabel><text>Preface</text></navLabel><content src="pr02.html"/><navPoint id="d0e58" playOrder="4"><navLabel><text>1. Welcome</text></navLabel><content src="pr02.html#d0e58"/></navPoint><navPoint id="d0e69" playOrder="5"><navLabel><text>2. Prerequisites</text></navLabel><content src="pr02s02.html"/></navPoint><navPoint id="d0e76" playOrder="6"><navLabel><text>3. Errata</text></navLabel><content src="pr02s03.html"/></navPoint><navPoint id="d0e95" playOrder="7"><navLabel><text>4. How this book is organized</text></navLabel><content src="pr02s04.html"/></navPoint><navPoint id="d0e110" playOrder="8"><navLabel><text>5. About the Author</text></navLabel><content src="pr02s05.html"/></navPoint><navPoint id="d0e121" playOrder="9"><navLabel><text>6. Acknowledgement</text></navLabel><content src="pr02s06.html"/></navPoint></navPoint><navPoint id="d0e128" playOrder="10"><navLabel><text>1. Introduction to Git</text></navLabel><content src="ch01.html"/><navPoint id="d0e133" playOrder="11"><navLabel><text>1.1. Git</text></navLabel><content src="ch01.html#git"/><navPoint id="d0e136" playOrder="12"><navLabel><text>What is Git?</text></navLabel><content src="ch01.html#gitdefintion"/></navPoint><navPoint id="d0e155" playOrder="13"><navLabel><text>Important terminology</text></navLabel><content src="ch01.html#gitterminology"/></navPoint><navPoint id="d0e201" playOrder="14"><navLabel><text>Staging index</text></navLabel><content src="ch01.html#git_stagingindex"/></navPoint></navPoint><navPoint id="d0e214" playOrder="15"><navLabel><text>1.2. Installation</text></navLabel><content src="ch01s02.html"/></navPoint><navPoint id="d0e228" playOrder="16"><navLabel><text>1.3. Setup</text></navLabel><content src="ch01s03.html"/><navPoint id="d0e238" playOrder="17"><navLabel><text>User Configuration</text></navLabel><content src="ch01s03.html#setup_user"/></navPoint><navPoint id="d0e255" playOrder="18"><navLabel><text>Color Highlighting</text></navLabel><content src="ch01s03.html#setup_highlighting"/></navPoint><navPoint id="d0e265" playOrder="19"><navLabel><text>Ignore certain files</text></navLabel><content src="ch01s03.html#setup_ignore"/></navPoint></navPoint></navPoint><navPoint id="d0e289" playOrder="20"><navLabel><text>2. A typical Git workflow</text></navLabel><content src="ch02.html"/><navPoint id="d0e294" playOrder="21"><navLabel><text>2.1. Getting started with Git</text></navLabel><content src="ch02.html#firstgit"/><navPoint id="d0e301" playOrder="22"><navLabel><text>Create content</text></navLabel><content src="ch02.html#firstgit_content"/></navPoint><navPoint id="d0e311" playOrder="23"><navLabel><text>Create repository, add and commit</text></navLabel><content src="ch02.html#firstgit_repo"/></navPoint><navPoint id="d0e329" playOrder="24"><navLabel><text>See differences via diff and commit changes</text></navLabel><content src="ch02.html#firstgit_changes"/></navPoint><navPoint id="d0e345" playOrder="25"><navLabel><text>Status, Diff and Commit Log</text></navLabel><content src="ch02.html#gitcommands_status"/></navPoint><navPoint id="d0e355" playOrder="26"><navLabel><text>Correction of commit messages - git amend</text></navLabel><content src="ch02.html#firstgit_amend"/></navPoint><navPoint id="d0e370" playOrder="27"><navLabel><text>Delete files</text></navLabel><content src="ch02.html#firstgit_deletefile"/></navPoint></navPoint><navPoint id="d0e392" playOrder="28"><navLabel><text>2.2. Working with remote repositories</text></navLabel><content src="ch02s02.html"/><navPoint id="d0e395" playOrder="29"><navLabel><text>Setting up a remote (bare) Git repository</text></navLabel><content src="ch02s02.html#remotes_setup"/></navPoint><navPoint id="d0e414" playOrder="30"><navLabel><text>Push changes to another repository</text></navLabel><content src="ch02s02.html#remotes_push"/></navPoint><navPoint id="d0e424" playOrder="31"><navLabel><text>Add remote</text></navLabel><content src="ch02s02.html#remotes_remoteadd"/></navPoint><navPoint id="d0e440" playOrder="32"><navLabel><text>Show the existing remote repositories</text></navLabel><content src="ch02s02.html#remotes_showremote"/></navPoint><navPoint id="d0e450" playOrder="33"><navLabel><text>Clone your repository</text></navLabel><content src="ch02s02.html#remotes_clone"/></navPoint><navPoint id="d0e460" playOrder="34"><navLabel><text>Pull changes</text></navLabel><content src="ch02s02.html#remotes_pull"/></navPoint></navPoint><navPoint id="d0e470" playOrder="35"><navLabel><text>2.3. Revert Changes</text></navLabel><content src="ch02s03.html"/></navPoint><navPoint id="d0e531" playOrder="36"><navLabel><text>2.4. Tagging in Git</text></navLabel><content src="ch02s04.html"/></navPoint></navPoint><navPoint id="d0e560" playOrder="37"><navLabel><text>3. Branch, merge and rebase</text></navLabel><content src="ch03.html"/><navPoint id="d0e565" playOrder="38"><navLabel><text>3.1. Branches and Merging</text></navLabel><content src="ch03.html#gitbranchmerge"/><navPoint id="d0e568" playOrder="39"><navLabel><text>Branches</text></navLabel><content src="ch03.html#gitbranch"/></navPoint><navPoint id="d0e600" playOrder="40"><navLabel><text>Merging</text></navLabel><content src="ch03.html#gitmerge"/></navPoint><navPoint id="d0e614" playOrder="41"><navLabel><text>Delete a branch</text></navLabel><content src="ch03.html#gitdeletebrach"/></navPoint></navPoint><navPoint id="d0e624" playOrder="42"><navLabel><text>3.2. Solving merge conflicts</text></navLabel><content src="ch03s02.html"/></navPoint><navPoint id="d0e658" playOrder="43"><navLabel><text>3.3. Rebase</text></navLabel><content src="ch03s03.html"/><navPoint id="d0e661" playOrder="44"><navLabel><text>Rebasing commits in the same branch</text></navLabel><content src="ch03s03.html#rebase_commits"/></navPoint><navPoint id="d0e696" playOrder="45"><navLabel><text>Rebasing branches</text></navLabel><content src="ch03s03.html#rebase_branches"/></navPoint><navPoint id="d0e711" playOrder="46"><navLabel><text>Best practice for rebase</text></navLabel><content src="ch03s03.html#rebase_bestpractise"/></navPoint></navPoint></navPoint><navPoint id="d0e724" playOrder="47"><navLabel><text>4. Git recipes</text></navLabel><content src="ch04.html"/><navPoint id="d0e729" playOrder="48"><navLabel><text>4.1. Create and apply patches</text></navLabel><content src="ch04.html#gitpatch"/></navPoint><navPoint id="d0e741" playOrder="49"><navLabel><text>4.2. Define alias</text></navLabel><content src="ch04s02.html"/></navPoint><navPoint id="d0e776" playOrder="50"><navLabel><text>4.3. Untrack a file / directory</text></navLabel><content src="ch04s03.html"/></navPoint><navPoint id="d0e794" playOrder="51"><navLabel><text>4.4. Other useful commands</text></navLabel><content src="ch04s04.html"/></navPoint><navPoint id="d0e825" playOrder="52"><navLabel><text>4.5. Installing a Git server</text></navLabel><content src="ch04s05.html"/></navPoint></navPoint><navPoint id="d0e865" playOrder="53"><navLabel><text>5. Getting online</text></navLabel><content src="ch05.html"/><navPoint id="d0e870" playOrder="54"><navLabel><text>5.1. Online remote repositories</text></navLabel><content src="ch05.html#remote"/><navPoint id="d0e873" playOrder="55"><navLabel><text>Cloning remote repositories</text></navLabel><content src="ch05.html#remote_clone"/></navPoint><navPoint id="d0e898" playOrder="56"><navLabel><text>Add more remote repositories</text></navLabel><content src="ch05.html#remote_add"/></navPoint><navPoint id="d0e921" playOrder="57"><navLabel><text>Remote operations via http and a proxy</text></navLabel><content src="ch05.html#remote_proxy"/></navPoint></navPoint><navPoint id="d0e942" playOrder="58"><navLabel><text>5.2. Git Hosting Provider</text></navLabel><content src="ch05s02.html"/><navPoint id="d0e947" playOrder="59"><navLabel><text>GitHub</text></navLabel><content src="ch05s02.html#hosting_github"/></navPoint><navPoint id="d0e969" playOrder="60"><navLabel><text>Bitbucket</text></navLabel><content src="ch05s02.html#hosting_bickbucket"/></navPoint></navPoint></navPoint><navPoint id="d0e974" playOrder="61"><navLabel><text>6. Outlook: Graphical user interfaces</text></navLabel><content src="ch06.html"/><navPoint id="d0e979" playOrder="62"><navLabel><text>6.1. Graphical UI's for Git</text></navLabel><content src="ch06.html#uis"/></navPoint></navPoint></navPoint></navMap></ncx>