1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
\r
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
\r
3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
\r
5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
\r
6 <meta name="generator" content="AsciiDoc 7.0.2" />
\r
7 <style type="text/css">
\r
9 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
\r
11 border: 1px solid red;
\r
16 margin: 1em 5% 1em 5%;
\r
20 a:visited { color: fuchsia; }
\r
34 h1, h2, h3, h4, h5, h6 {
\r
36 font-family: sans-serif;
\r
38 margin-bottom: 0.5em;
\r
43 border-bottom: 2px solid silver;
\r
46 border-bottom: 2px solid silver;
\r
56 border: 1px solid silver;
\r
61 margin-bottom: 0.5em;
\r
71 font-family: sans-serif;
\r
78 font-family: sans-serif;
\r
82 font-family: sans-serif;
\r
84 border-top: 2px solid silver;
\r
90 padding-bottom: 0.5em;
\r
94 padding-bottom: 0.5em;
\r
98 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
\r
99 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
\r
100 div.admonitionblock {
\r
103 margin-bottom: 1.5em;
\r
105 div.admonitionblock {
\r
107 margin-bottom: 2.5em;
\r
110 div.content { /* Block element content. */
\r
114 /* Block element titles. */
\r
115 div.title, caption.title {
\r
116 font-family: sans-serif;
\r
120 margin-bottom: 0.5em;
\r
126 td div.title:first-child {
\r
129 div.content div.title:first-child {
\r
132 div.content + div.title {
\r
136 div.sidebarblock > div.content {
\r
137 background: #ffffee;
\r
138 border: 1px solid silver;
\r
142 div.listingblock > div.content {
\r
143 border: 1px solid silver;
\r
144 background: #f4f4f4;
\r
148 div.quoteblock > div.content {
\r
149 padding-left: 2.0em;
\r
151 div.quoteblock .attribution {
\r
155 div.admonitionblock .icon {
\r
156 vertical-align: top;
\r
159 text-decoration: underline;
\r
161 padding-right: 0.5em;
\r
163 div.admonitionblock td.content {
\r
164 padding-left: 0.5em;
\r
165 border-left: 2px solid silver;
\r
168 div.exampleblock > div.content {
\r
169 border-left: 2px solid silver;
\r
173 div.verseblock div.content {
\r
177 div.imageblock div.content { padding-left: 0; }
\r
178 div.imageblock img { border: 1px solid silver; }
\r
179 span.image img { border-style: none; }
\r
183 margin-bottom: 0.8em;
\r
188 font-style: italic;
\r
190 dd > *:first-child {
\r
195 list-style-position: outside;
\r
198 list-style-type: lower-alpha;
\r
201 div.tableblock > table {
\r
202 border-color: #527bbd;
\r
206 font-family: sans-serif;
\r
215 margin-bottom: 0.8em;
\r
218 vertical-align: top;
\r
219 font-style: italic;
\r
220 padding-right: 0.8em;
\r
223 vertical-align: top;
\r
227 div#footer-badges { display: none; }
\r
229 include::./stylesheets/xhtml11-manpage.css[]
\r
230 /* Workarounds for IE6's broken and incomplete CSS2. */
\r
232 div.sidebar-content {
\r
233 background: #ffffee;
\r
234 border: 1px solid silver;
\r
237 div.sidebar-title, div.image-title {
\r
238 font-family: sans-serif;
\r
241 margin-bottom: 0.5em;
\r
244 div.listingblock div.content {
\r
245 border: 1px solid silver;
\r
246 background: #f4f4f4;
\r
250 div.quoteblock-content {
\r
251 padding-left: 2.0em;
\r
254 div.exampleblock-content {
\r
255 border-left: 2px solid silver;
\r
256 padding-left: 0.5em;
\r
259 <title>git(7)</title>
\r
267 <div class="sectionbody">
\r
269 the stupid content tracker
\r
274 <div class="sectionbody">
\r
275 <p><em>git</em> [--version] [--exec-path[=GIT_EXEC_PATH]] [--help] COMMAND [ARGS]</p>
\r
277 <h2>DESCRIPTION</h2>
\r
278 <div class="sectionbody">
\r
279 <p>Git is a fast, scalable, distributed revision control system with an
\r
280 unusually rich command set that provides both high-level operations
\r
281 and full access to internals.</p>
\r
282 <p>See this <a href="tutorial.html">tutorial</a> to get started, then see
\r
283 <a href="everyday.html">Everyday Git</a> for a useful minimum set of commands, and
\r
284 "man git-commandname" for documentation of each command. CVS users may
\r
285 also want to read <a href="cvs-migration.html">CVS migration</a>.</p>
\r
288 <div class="sectionbody">
\r
295 Prints the git suite version that the <em>git</em> program came from.
\r
303 Prints the synopsis and a list of the most commonly used
\r
304 commands. If a git command is named this option will bring up
\r
305 the man-page for that command. If the option <em>--all</em> or <em>-a</em> is
\r
306 given then all available commands are printed.
\r
314 Path to wherever your core git programs are installed.
\r
315 This can also be controlled by setting the GIT_EXEC_PATH
\r
316 environment variable. If no path is given <em>git</em> will print
\r
317 the current setting and then exit.
\r
322 <h2>FURTHER DOCUMENTATION</h2>
\r
323 <div class="sectionbody">
\r
324 <p>See the references above to get started using git. The following is
\r
325 probably more detail than necessary for a first-time user.</p>
\r
326 <p>The <a href="#Discussion">Discussion</a> section below and the
\r
327 <a href="core-tutorial.html">Core tutorial</a> both provide introductions to the
\r
328 underlying git architecture.</p>
\r
329 <p>See also the <a href="howto-index.html">howto</a> documents for some useful
\r
332 <h2>GIT COMMANDS</h2>
\r
333 <div class="sectionbody">
\r
334 <p>We divide git into high level ("porcelain") commands and low level
\r
335 ("plumbing") commands.</p>
\r
337 <h2>Low-level commands (plumbing)</h2>
\r
338 <div class="sectionbody">
\r
339 <p>Although git includes its
\r
340 own porcelain layer, its low-level commands are sufficient to support
\r
341 development of alternative porcelains. Developers of such porcelains
\r
342 might start by reading about <a href="git-update-index.html">git-update-index(1)</a> and
\r
343 <a href="git-read-tree.html">git-read-tree(1)</a>.</p>
\r
344 <p>We divide the low-level commands into commands that manipulate objects (in
\r
345 the repository, index, and working tree), commands that interrogate and
\r
346 compare objects, and commands that move objects and references between
\r
348 <h3>Manipulation commands</h3>
\r
351 <a href="git-apply.html">git-apply(1)</a>
\r
355 Reads a "diff -up1" or git generated patch file and
\r
356 applies it to the working tree.
\r
360 <a href="git-checkout-index.html">git-checkout-index(1)</a>
\r
364 Copy files from the index to the working tree.
\r
368 <a href="git-commit-tree.html">git-commit-tree(1)</a>
\r
372 Creates a new commit object.
\r
376 <a href="git-hash-object.html">git-hash-object(1)</a>
\r
380 Computes the object ID from a file.
\r
384 <a href="git-index-pack.html">git-index-pack(1)</a>
\r
388 Build pack idx file for an existing packed archive.
\r
392 <a href="git-init-db.html">git-init-db(1)</a>
\r
396 Creates an empty git object database, or reinitialize an
\r
401 <a href="git-merge-index.html">git-merge-index(1)</a>
\r
405 Runs a merge for files needing merging.
\r
409 <a href="git-mktag.html">git-mktag(1)</a>
\r
413 Creates a tag object.
\r
417 <a href="git-mktree.html">git-mktree(1)</a>
\r
421 Build a tree-object from ls-tree formatted text.
\r
425 <a href="git-pack-objects.html">git-pack-objects(1)</a>
\r
429 Creates a packed archive of objects.
\r
433 <a href="git-prune-packed.html">git-prune-packed(1)</a>
\r
437 Remove extra objects that are already in pack files.
\r
441 <a href="git-read-tree.html">git-read-tree(1)</a>
\r
445 Reads tree information into the index.
\r
449 <a href="git-repo-config.html">git-repo-config(1)</a>
\r
453 Get and set options in .git/config.
\r
457 <a href="git-unpack-objects.html">git-unpack-objects(1)</a>
\r
461 Unpacks objects out of a packed archive.
\r
465 <a href="git-update-index.html">git-update-index(1)</a>
\r
469 Registers files in the working tree to the index.
\r
473 <a href="git-write-tree.html">git-write-tree(1)</a>
\r
477 Creates a tree from the index.
\r
481 <h3>Interrogation commands</h3>
\r
484 <a href="git-cat-file.html">git-cat-file(1)</a>
\r
488 Provide content or type/size information for repository objects.
\r
492 <a href="git-describe.html">git-describe(1)</a>
\r
496 Show the most recent tag that is reachable from a commit.
\r
500 <a href="git-diff-index.html">git-diff-index(1)</a>
\r
504 Compares content and mode of blobs between the index and repository.
\r
508 <a href="git-diff-files.html">git-diff-files(1)</a>
\r
512 Compares files in the working tree and the index.
\r
516 <a href="git-diff-stages.html">git-diff-stages(1)</a>
\r
520 Compares two "merge stages" in the index.
\r
524 <a href="git-diff-tree.html">git-diff-tree(1)</a>
\r
528 Compares the content and mode of blobs found via two tree objects.
\r
532 <a href="git-fsck-objects.html">git-fsck-objects(1)</a>
\r
536 Verifies the connectivity and validity of the objects in the database.
\r
540 <a href="git-ls-files.html">git-ls-files(1)</a>
\r
544 Information about files in the index and the working tree.
\r
548 <a href="git-ls-tree.html">git-ls-tree(1)</a>
\r
552 Displays a tree object in human readable form.
\r
556 <a href="git-merge-base.html">git-merge-base(1)</a>
\r
560 Finds as good common ancestors as possible for a merge.
\r
564 <a href="git-name-rev.html">git-name-rev(1)</a>
\r
568 Find symbolic names for given revs.
\r
572 <a href="git-pack-redundant.html">git-pack-redundant(1)</a>
\r
576 Find redundant pack files.
\r
580 <a href="git-rev-list.html">git-rev-list(1)</a>
\r
584 Lists commit objects in reverse chronological order.
\r
588 <a href="git-show-index.html">git-show-index(1)</a>
\r
592 Displays contents of a pack idx file.
\r
596 <a href="git-tar-tree.html">git-tar-tree(1)</a>
\r
600 Creates a tar archive of the files in the named tree object.
\r
604 <a href="git-unpack-file.html">git-unpack-file(1)</a>
\r
608 Creates a temporary file with a blob's contents.
\r
612 <a href="git-var.html">git-var(1)</a>
\r
616 Displays a git logical variable.
\r
620 <a href="git-verify-pack.html">git-verify-pack(1)</a>
\r
624 Validates packed git archive files.
\r
628 <p>In general, the interrogate commands do not touch the files in
\r
629 the working tree.</p>
\r
630 <h3>Synching repositories</h3>
\r
633 <a href="git-clone-pack.html">git-clone-pack(1)</a>
\r
637 Clones a repository into the current repository (engine
\r
638 for ssh and local transport).
\r
642 <a href="git-fetch-pack.html">git-fetch-pack(1)</a>
\r
646 Updates from a remote repository (engine for ssh and
\r
651 <a href="git-http-fetch.html">git-http-fetch(1)</a>
\r
655 Downloads a remote git repository via HTTP by walking
\r
660 <a href="git-local-fetch.html">git-local-fetch(1)</a>
\r
664 Duplicates another git repository on a local system by
\r
665 walking commit chain.
\r
669 <a href="git-peek-remote.html">git-peek-remote(1)</a>
\r
673 Lists references on a remote repository using
\r
674 upload-pack protocol (engine for ssh and local
\r
679 <a href="git-receive-pack.html">git-receive-pack(1)</a>
\r
683 Invoked by <em>git-send-pack</em> to receive what is pushed to it.
\r
687 <a href="git-send-pack.html">git-send-pack(1)</a>
\r
691 Pushes to a remote repository, intelligently.
\r
695 <a href="git-http-push.html">git-http-push(1)</a>
\r
699 Push missing objects using HTTP/DAV.
\r
703 <a href="git-shell.html">git-shell(1)</a>
\r
707 Restricted shell for GIT-only SSH access.
\r
711 <a href="git-ssh-fetch.html">git-ssh-fetch(1)</a>
\r
715 Pulls from a remote repository over ssh connection by
\r
716 walking commit chain.
\r
720 <a href="git-ssh-upload.html">git-ssh-upload(1)</a>
\r
724 Helper "server-side" program used by git-ssh-fetch.
\r
728 <a href="git-update-server-info.html">git-update-server-info(1)</a>
\r
732 Updates auxiliary information on a dumb server to help
\r
733 clients discover references and packs on it.
\r
737 <a href="git-upload-pack.html">git-upload-pack(1)</a>
\r
741 Invoked by <em>git-clone-pack</em> and <em>git-fetch-pack</em> to push
\r
742 what are asked for.
\r
747 <h2>High-level commands (porcelain)</h2>
\r
748 <div class="sectionbody">
\r
749 <p>We separate the porcelain commands into the main commands and some
\r
750 ancillary user utilities.</p>
\r
751 <h3>Main porcelain commands</h3>
\r
754 <a href="git-add.html">git-add(1)</a>
\r
758 Add paths to the index.
\r
762 <a href="git-am.html">git-am(1)</a>
\r
766 Apply patches from a mailbox, but cooler.
\r
770 <a href="git-applymbox.html">git-applymbox(1)</a>
\r
774 Apply patches from a mailbox, original version by Linus.
\r
778 <a href="git-bisect.html">git-bisect(1)</a>
\r
782 Find the change that introduced a bug by binary search.
\r
786 <a href="git-branch.html">git-branch(1)</a>
\r
790 Create and Show branches.
\r
794 <a href="git-checkout.html">git-checkout(1)</a>
\r
798 Checkout and switch to a branch.
\r
802 <a href="git-cherry-pick.html">git-cherry-pick(1)</a>
\r
806 Cherry-pick the effect of an existing commit.
\r
810 <a href="git-clean.html">git-clean(1)</a>
\r
814 Remove untracked files from the working tree.
\r
818 <a href="git-clone.html">git-clone(1)</a>
\r
822 Clones a repository into a new directory.
\r
826 <a href="git-commit.html">git-commit(1)</a>
\r
830 Record changes to the repository.
\r
834 <a href="git-diff.html">git-diff(1)</a>
\r
838 Show changes between commits, commit and working tree, etc.
\r
842 <a href="git-fetch.html">git-fetch(1)</a>
\r
846 Download from a remote repository via various protocols.
\r
850 <a href="git-format-patch.html">git-format-patch(1)</a>
\r
854 Prepare patches for e-mail submission.
\r
858 <a href="git-grep.html">git-grep(1)</a>
\r
862 Print lines matching a pattern.
\r
866 <a href="git-log.html">git-log(1)</a>
\r
874 <a href="git-ls-remote.html">git-ls-remote(1)</a>
\r
878 Shows references in a remote or local repository.
\r
882 <a href="git-merge.html">git-merge(1)</a>
\r
886 Grand unified merge driver.
\r
890 <a href="git-mv.html">git-mv(1)</a>
\r
894 Move or rename a file, a directory, or a symlink.
\r
898 <a href="git-pull.html">git-pull(1)</a>
\r
902 Fetch from and merge with a remote repository.
\r
906 <a href="git-push.html">git-push(1)</a>
\r
910 Update remote refs along with associated objects.
\r
914 <a href="git-rebase.html">git-rebase(1)</a>
\r
918 Rebase local commits to the updated upstream head.
\r
922 <a href="git-repack.html">git-repack(1)</a>
\r
926 Pack unpacked objects in a repository.
\r
930 <a href="git-rerere.html">git-rerere(1)</a>
\r
934 Reuse recorded resolution of conflicted merges.
\r
938 <a href="git-reset.html">git-reset(1)</a>
\r
942 Reset current HEAD to the specified state.
\r
946 <a href="git-resolve.html">git-resolve(1)</a>
\r
954 <a href="git-revert.html">git-revert(1)</a>
\r
958 Revert an existing commit.
\r
962 <a href="git-rm.html">git-rm(1)</a>
\r
966 Remove files from the working tree and from the index.
\r
970 <a href="git-shortlog.html">git-shortlog(1)</a>
\r
974 Summarizes <em>git log</em> output.
\r
978 <a href="git-show.html">git-show(1)</a>
\r
982 Show one commit log and its diff.
\r
986 <a href="git-show-branch.html">git-show-branch(1)</a>
\r
990 Show branches and their commits.
\r
994 <a href="git-status.html">git-status(1)</a>
\r
998 Shows the working tree status.
\r
1002 <a href="git-verify-tag.html">git-verify-tag(1)</a>
\r
1006 Check the GPG signature of tag.
\r
1010 <a href="git-whatchanged.html">git-whatchanged(1)</a>
\r
1014 Shows commit logs and differences they introduce.
\r
1018 <h3>Ancillary Commands</h3>
\r
1019 <p>Manipulators:</p>
\r
1022 <a href="git-applypatch.html">git-applypatch(1)</a>
\r
1026 Apply one patch extracted from an e-mail.
\r
1030 <a href="git-archimport.html">git-archimport(1)</a>
\r
1034 Import an arch repository into git.
\r
1038 <a href="git-convert-objects.html">git-convert-objects(1)</a>
\r
1042 Converts old-style git repository.
\r
1046 <a href="git-cvsimport.html">git-cvsimport(1)</a>
\r
1050 Salvage your data out of another SCM people love to hate.
\r
1054 <a href="git-cvsexportcommit.html">git-cvsexportcommit(1)</a>
\r
1058 Export a single commit to a CVS checkout.
\r
1062 <a href="git-cvsserver.html">git-cvsserver(1)</a>
\r
1066 A CVS server emulator for git.
\r
1070 <a href="git-lost-found.html">git-lost-found(1)</a>
\r
1074 Recover lost refs that luckily have not yet been pruned.
\r
1078 <a href="git-merge-one-file.html">git-merge-one-file(1)</a>
\r
1082 The standard helper program to use with <tt>git-merge-index</tt>.
\r
1086 <a href="git-prune.html">git-prune(1)</a>
\r
1090 Prunes all unreachable objects from the object database.
\r
1094 <a href="git-relink.html">git-relink(1)</a>
\r
1098 Hardlink common objects in local repositories.
\r
1102 <a href="git-svnimport.html">git-svnimport(1)</a>
\r
1106 Import a SVN repository into git.
\r
1110 <a href="git-sh-setup.html">git-sh-setup(1)</a>
\r
1114 Common git shell script setup code.
\r
1118 <a href="git-symbolic-ref.html">git-symbolic-ref(1)</a>
\r
1122 Read and modify symbolic refs.
\r
1126 <a href="git-tag.html">git-tag(1)</a>
\r
1130 An example script to create a tag object signed with GPG.
\r
1134 <a href="git-update-ref.html">git-update-ref(1)</a>
\r
1138 Update the object name stored in a ref safely.
\r
1142 <p>Interrogators:</p>
\r
1145 <a href="git-check-ref-format.html">git-check-ref-format(1)</a>
\r
1149 Make sure ref name is well formed.
\r
1153 <a href="git-cherry.html">git-cherry(1)</a>
\r
1157 Find commits not merged upstream.
\r
1161 <a href="git-count-objects.html">git-count-objects(1)</a>
\r
1165 Count unpacked number of objects and their disk consumption.
\r
1169 <a href="git-daemon.html">git-daemon(1)</a>
\r
1173 A really simple server for git repositories.
\r
1177 <a href="git-fmt-merge-msg.html">git-fmt-merge-msg(1)</a>
\r
1181 Produce a merge commit message.
\r
1185 <a href="git-get-tar-commit-id.html">git-get-tar-commit-id(1)</a>
\r
1189 Extract commit ID from an archive created using git-tar-tree.
\r
1193 <a href="git-imap-send.html">git-imap-send(1)</a>
\r
1197 Dump a mailbox from stdin into an imap folder.
\r
1201 <a href="git-mailinfo.html">git-mailinfo(1)</a>
\r
1205 Extracts patch and authorship information from a single
\r
1206 e-mail message, optionally transliterating the commit
\r
1207 message into utf-8.
\r
1211 <a href="git-mailsplit.html">git-mailsplit(1)</a>
\r
1215 A stupid program to split UNIX mbox format mailbox into
\r
1216 individual pieces of e-mail.
\r
1220 <a href="git-merge-tree.html">git-merge-tree(1)</a>
\r
1224 Show three-way merge without touching index.
\r
1228 <a href="git-patch-id.html">git-patch-id(1)</a>
\r
1232 Compute unique ID for a patch.
\r
1236 <a href="git-parse-remote.html">git-parse-remote(1)</a>
\r
1240 Routines to help parsing <tt>$GIT_DIR/remotes/</tt> files.
\r
1244 <a href="git-request-pull.html">git-request-pull(1)</a>
\r
1252 <a href="git-rev-parse.html">git-rev-parse(1)</a>
\r
1256 Pick out and massage parameters.
\r
1260 <a href="git-send-email.html">git-send-email(1)</a>
\r
1264 Send patch e-mails out of "format-patch --mbox" output.
\r
1268 <a href="git-symbolic-ref.html">git-symbolic-ref(1)</a>
\r
1272 Read and modify symbolic refs.
\r
1276 <a href="git-stripspace.html">git-stripspace(1)</a>
\r
1280 Filter out empty lines.
\r
1285 <h2>Commands not yet documented</h2>
\r
1286 <div class="sectionbody">
\r
1289 <a href="gitk.html">gitk(1)</a>
\r
1293 The gitk repository browser.
\r
1298 <h2>Configuration Mechanism</h2>
\r
1299 <div class="sectionbody">
\r
1300 <p>Starting from 0.99.9 (actually mid 0.99.8.GIT), <tt>.git/config</tt> file
\r
1301 is used to hold per-repository configuration options. It is a
\r
1302 simple text file modelled after <tt>.ini</tt> format familiar to some
\r
1303 people. Here is an example:</p>
\r
1304 <div class="listingblock">
\r
1305 <div class="content">
\r
1307 # A '#' or ';' character indicates a comment.
\r
1312 ; Don't trust file modes
\r
1317 name = "Junio C Hamano"
\r
1318 email = "junkio@twinsun.com"
\r
1321 <p>Various commands read from the configuration file and adjust
\r
1322 their operation accordingly.</p>
\r
1324 <h2>Identifier Terminology</h2>
\r
1325 <div class="sectionbody">
\r
1332 Indicates the object name for any type of object.
\r
1340 Indicates a blob object name.
\r
1348 Indicates a tree object name.
\r
1356 Indicates a commit object name.
\r
1364 Indicates a tree, commit or tag object name. A
\r
1365 command that takes a <tree-ish> argument ultimately wants to
\r
1366 operate on a <tree> object but automatically dereferences
\r
1367 <commit> and <tag> objects that point at a <tree>.
\r
1375 Indicates that an object type is required.
\r
1376 Currently one of: <tt>blob</tt>, <tt>tree</tt>, <tt>commit</tt>, or <tt>tag</tt>.
\r
1384 Indicates a filename - almost always relative to the
\r
1385 root of the tree structure <tt>GIT_INDEX_FILE</tt> describes.
\r
1390 <h2>Symbolic Identifiers</h2>
\r
1391 <div class="sectionbody">
\r
1392 <p>Any git command accepting any <object> can also use the following
\r
1393 symbolic notation:</p>
\r
1400 indicates the head of the current branch (i.e. the
\r
1401 contents of <tt>$GIT_DIR/HEAD</tt>).
\r
1409 a valid tag <em>name</em>
\r
1410 (i.e. the contents of <tt>$GIT_DIR/refs/tags/<tag></tt>).
\r
1418 a valid head <em>name</em>
\r
1419 (i.e. the contents of <tt>$GIT_DIR/refs/heads/<head></tt>).
\r
1424 <h2>File/Directory Structure</h2>
\r
1425 <div class="sectionbody">
\r
1426 <p>Please see <a href="repository-layout.html">repository layout</a> document.</p>
\r
1427 <p>Read <a href="hooks.html">hooks</a> for more details about each hook.</p>
\r
1428 <p>Higher level SCMs may provide and manage additional information in the
\r
1429 <tt>$GIT_DIR</tt>.</p>
\r
1431 <h2>Terminology</h2>
\r
1432 <div class="sectionbody">
\r
1433 <p>Please see <a href="glossary.html">glossary</a> document.</p>
\r
1435 <h2>Environment Variables</h2>
\r
1436 <div class="sectionbody">
\r
1437 <p>Various git commands use the following environment variables:</p>
\r
1438 <h3>The git Repository</h3>
\r
1439 <p>These environment variables apply to <em>all</em> core git commands. Nb: it
\r
1440 is worth noting that they may be used/overridden by SCMS sitting above
\r
1441 git so take care if using Cogito etc.</p>
\r
1444 <em>GIT_INDEX_FILE</em>
\r
1448 This environment allows the specification of an alternate
\r
1449 index file. If not specified, the default of <tt>$GIT_DIR/index</tt>
\r
1454 <em>GIT_OBJECT_DIRECTORY</em>
\r
1458 If the object storage directory is specified via this
\r
1459 environment variable then the sha1 directories are created
\r
1460 underneath - otherwise the default <tt>$GIT_DIR/objects</tt>
\r
1461 directory is used.
\r
1465 <em>GIT_ALTERNATE_OBJECT_DIRECTORIES</em>
\r
1469 Due to the immutable nature of git objects, old objects can be
\r
1470 archived into shared, read-only directories. This variable
\r
1471 specifies a ":" separated list of git object directories which
\r
1472 can be used to search for git objects. New objects will not be
\r
1473 written to these directories.
\r
1481 If the <em>GIT_DIR</em> environment variable is set then it
\r
1482 specifies a path to use instead of the default <tt>.git</tt>
\r
1483 for the base of the repository.
\r
1487 <h3>git Commits</h3>
\r
1490 <em>GIT_AUTHOR_NAME</em>
\r
1493 <em>GIT_AUTHOR_EMAIL</em>
\r
1496 <em>GIT_AUTHOR_DATE</em>
\r
1499 <em>GIT_COMMITTER_NAME</em>
\r
1502 <em>GIT_COMMITTER_EMAIL</em>
\r
1506 see <a href="git-commit-tree.html">git-commit-tree(1)</a>
\r
1510 <h3>git Diffs</h3>
\r
1513 <em>GIT_DIFF_OPTS</em>
\r
1516 <em>GIT_EXTERNAL_DIFF</em>
\r
1520 see the "generating patches" section in :
\r
1521 <a href="git-diff-index.html">git-diff-index(1)</a>;
\r
1522 <a href="git-diff-files.html">git-diff-files(1)</a>;
\r
1523 <a href="git-diff-tree.html">git-diff-tree(1)</a>
\r
1528 <h2>Discussion<a id="Discussion"></a></h2>
\r
1529 <div class="sectionbody">
\r
1530 <p>"git" can mean anything, depending on your mood.</p>
\r
1534 random three-letter combination that is pronounceable, and not
\r
1535 actually used by any common UNIX command. The fact that it is a
\r
1536 mispronunciation of "get" may or may not be relevant.
\r
1541 stupid. contemptible and despicable. simple. Take your pick from the
\r
1542 dictionary of slang.
\r
1547 "global information tracker": you're in a good mood, and it actually
\r
1548 works for you. Angels sing, and a light suddenly fills the room.
\r
1553 "goddamn idiotic truckload of sh*t": when it breaks
\r
1557 <p>This is a stupid (but extremely fast) directory content manager. It
\r
1558 doesn't do a whole lot, but what it <em>does</em> do is track directory
\r
1559 contents efficiently.</p>
\r
1560 <p>There are two object abstractions: the "object database", and the
\r
1561 "current directory cache" aka "index".</p>
\r
1562 <h3>The Object Database</h3>
\r
1563 <p>The object database is literally just a content-addressable collection
\r
1564 of objects. All objects are named by their content, which is
\r
1565 approximated by the SHA1 hash of the object itself. Objects may refer
\r
1566 to other objects (by referencing their SHA1 hash), and so you can
\r
1567 build up a hierarchy of objects.</p>
\r
1568 <p>All objects have a statically determined "type" aka "tag", which is
\r
1569 determined at object creation time, and which identifies the format of
\r
1570 the object (i.e. how it is used, and how it can refer to other
\r
1571 objects). There are currently four different object types: "blob",
\r
1572 "tree", "commit" and "tag".</p>
\r
1573 <p>A "blob" object cannot refer to any other object, and is, like the type
\r
1574 implies, a pure storage object containing some user data. It is used to
\r
1575 actually store the file data, i.e. a blob object is associated with some
\r
1576 particular version of some file.</p>
\r
1577 <p>A "tree" object is an object that ties one or more "blob" objects into a
\r
1578 directory structure. In addition, a tree object can refer to other tree
\r
1579 objects, thus creating a directory hierarchy.</p>
\r
1580 <p>A "commit" object ties such directory hierarchies together into
\r
1581 a DAG of revisions - each "commit" is associated with exactly one tree
\r
1582 (the directory hierarchy at the time of the commit). In addition, a
\r
1583 "commit" refers to one or more "parent" commit objects that describe the
\r
1584 history of how we arrived at that directory hierarchy.</p>
\r
1585 <p>As a special case, a commit object with no parents is called the "root"
\r
1586 object, and is the point of an initial project commit. Each project
\r
1587 must have at least one root, and while you can tie several different
\r
1588 root objects together into one project by creating a commit object which
\r
1589 has two or more separate roots as its ultimate parents, that's probably
\r
1590 just going to confuse people. So aim for the notion of "one root object
\r
1591 per project", even if git itself does not enforce that.</p>
\r
1592 <p>A "tag" object symbolically identifies and can be used to sign other
\r
1593 objects. It contains the identifier and type of another object, a
\r
1594 symbolic name (of course!) and, optionally, a signature.</p>
\r
1595 <p>Regardless of object type, all objects share the following
\r
1596 characteristics: they are all deflated with zlib, and have a header
\r
1597 that not only specifies their type, but also provides size information
\r
1598 about the data in the object. It's worth noting that the SHA1 hash
\r
1599 that is used to name the object is the hash of the original data
\r
1600 plus this header, so <tt>sha1sum</tt> <em>file</em> does not match the object name
\r
1601 for <em>file</em>.
\r
1602 (Historical note: in the dawn of the age of git the hash
\r
1603 was the sha1 of the <em>compressed</em> object.)</p>
\r
1604 <p>As a result, the general consistency of an object can always be tested
\r
1605 independently of the contents or the type of the object: all objects can
\r
1606 be validated by verifying that (a) their hashes match the content of the
\r
1607 file and (b) the object successfully inflates to a stream of bytes that
\r
1608 forms a sequence of <ascii type without space> + <space> + <ascii decimal
\r
1609 size> + <byte\0> + <binary object data>.</p>
\r
1610 <p>The structured objects can further have their structure and
\r
1611 connectivity to other objects verified. This is generally done with
\r
1612 the <tt>git-fsck-objects</tt> program, which generates a full dependency graph
\r
1613 of all objects, and verifies their internal consistency (in addition
\r
1614 to just verifying their superficial consistency through the hash).</p>
\r
1615 <p>The object types in some more detail:</p>
\r
1616 <h3>Blob Object</h3>
\r
1617 <p>A "blob" object is nothing but a binary blob of data, and doesn't
\r
1618 refer to anything else. There is no signature or any other
\r
1619 verification of the data, so while the object is consistent (it <em>is</em>
\r
1620 indexed by its sha1 hash, so the data itself is certainly correct), it
\r
1621 has absolutely no other attributes. No name associations, no
\r
1622 permissions. It is purely a blob of data (i.e. normally "file
\r
1624 <p>In particular, since the blob is entirely defined by its data, if two
\r
1625 files in a directory tree (or in multiple different versions of the
\r
1626 repository) have the same contents, they will share the same blob
\r
1627 object. The object is totally independent of its location in the
\r
1628 directory tree, and renaming a file does not change the object that
\r
1629 file is associated with in any way.</p>
\r
1630 <p>A blob is typically created when <a href="git-update-index.html">git-update-index(1)</a>
\r
1631 is run, and its data can be accessed by <a href="git-cat-file.html">git-cat-file(1)</a>.</p>
\r
1632 <h3>Tree Object</h3>
\r
1633 <p>The next hierarchical object type is the "tree" object. A tree object
\r
1634 is a list of mode/name/blob data, sorted by name. Alternatively, the
\r
1635 mode data may specify a directory mode, in which case instead of
\r
1636 naming a blob, that name is associated with another TREE object.</p>
\r
1637 <p>Like the "blob" object, a tree object is uniquely determined by the
\r
1638 set contents, and so two separate but identical trees will always
\r
1639 share the exact same object. This is true at all levels, i.e. it's
\r
1640 true for a "leaf" tree (which does not refer to any other trees, only
\r
1641 blobs) as well as for a whole subdirectory.</p>
\r
1642 <p>For that reason a "tree" object is just a pure data abstraction: it
\r
1643 has no history, no signatures, no verification of validity, except
\r
1644 that since the contents are again protected by the hash itself, we can
\r
1645 trust that the tree is immutable and its contents never change.</p>
\r
1646 <p>So you can trust the contents of a tree to be valid, the same way you
\r
1647 can trust the contents of a blob, but you don't know where those
\r
1648 contents <em>came</em> from.</p>
\r
1649 <p>Side note on trees: since a "tree" object is a sorted list of
\r
1650 "filename+content", you can create a diff between two trees without
\r
1651 actually having to unpack two trees. Just ignore all common parts,
\r
1652 and your diff will look right. In other words, you can effectively
\r
1653 (and efficiently) tell the difference between any two random trees by
\r
1654 O(n) where "n" is the size of the difference, rather than the size of
\r
1656 <p>Side note 2 on trees: since the name of a "blob" depends entirely and
\r
1657 exclusively on its contents (i.e. there are no names or permissions
\r
1658 involved), you can see trivial renames or permission changes by
\r
1659 noticing that the blob stayed the same. However, renames with data
\r
1660 changes need a smarter "diff" implementation.</p>
\r
1661 <p>A tree is created with <a href="git-write-tree.html">git-write-tree(1)</a> and
\r
1662 its data can be accessed by <a href="git-ls-tree.html">git-ls-tree(1)</a>.
\r
1663 Two trees can be compared with <a href="git-diff-tree.html">git-diff-tree(1)</a>.</p>
\r
1664 <h3>Commit Object</h3>
\r
1665 <p>The "commit" object is an object that introduces the notion of
\r
1666 history into the picture. In contrast to the other objects, it
\r
1667 doesn't just describe the physical state of a tree, it describes how
\r
1668 we got there, and why.</p>
\r
1669 <p>A "commit" is defined by the tree-object that it results in, the
\r
1670 parent commits (zero, one or more) that led up to that point, and a
\r
1671 comment on what happened. Again, a commit is not trusted per se:
\r
1672 the contents are well-defined and "safe" due to the cryptographically
\r
1673 strong signatures at all levels, but there is no reason to believe
\r
1674 that the tree is "good" or that the merge information makes sense.
\r
1675 The parents do not have to actually have any relationship with the
\r
1676 result, for example.</p>
\r
1677 <p>Note on commits: unlike real SCM's, commits do not contain
\r
1678 rename information or file mode change information. All of that is
\r
1679 implicit in the trees involved (the result tree, and the result trees
\r
1680 of the parents), and describing that makes no sense in this idiotic
\r
1682 <p>A commit is created with <a href="git-commit-tree.html">git-commit-tree(1)</a> and
\r
1683 its data can be accessed by <a href="git-cat-file.html">git-cat-file(1)</a>.</p>
\r
1685 <p>An aside on the notion of "trust". Trust is really outside the scope
\r
1686 of "git", but it's worth noting a few things. First off, since
\r
1687 everything is hashed with SHA1, you <em>can</em> trust that an object is
\r
1688 intact and has not been messed with by external sources. So the name
\r
1689 of an object uniquely identifies a known state - just not a state that
\r
1690 you may want to trust.</p>
\r
1691 <p>Furthermore, since the SHA1 signature of a commit refers to the
\r
1692 SHA1 signatures of the tree it is associated with and the signatures
\r
1693 of the parent, a single named commit specifies uniquely a whole set
\r
1694 of history, with full contents. You can't later fake any step of the
\r
1695 way once you have the name of a commit.</p>
\r
1696 <p>So to introduce some real trust in the system, the only thing you need
\r
1697 to do is to digitally sign just <em>one</em> special note, which includes the
\r
1698 name of a top-level commit. Your digital signature shows others
\r
1699 that you trust that commit, and the immutability of the history of
\r
1700 commits tells others that they can trust the whole history.</p>
\r
1701 <p>In other words, you can easily validate a whole archive by just
\r
1702 sending out a single email that tells the people the name (SHA1 hash)
\r
1703 of the top commit, and digitally sign that email using something
\r
1705 <p>To assist in this, git also provides the tag object…</p>
\r
1706 <h3>Tag Object</h3>
\r
1707 <p>Git provides the "tag" object to simplify creating, managing and
\r
1708 exchanging symbolic and signed tokens. The "tag" object at its
\r
1709 simplest simply symbolically identifies another object by containing
\r
1710 the sha1, type and symbolic name.</p>
\r
1711 <p>However it can optionally contain additional signature information
\r
1712 (which git doesn't care about as long as there's less than 8k of
\r
1713 it). This can then be verified externally to git.</p>
\r
1714 <p>Note that despite the tag features, "git" itself only handles content
\r
1715 integrity; the trust framework (and signature provision and
\r
1716 verification) has to come from outside.</p>
\r
1717 <p>A tag is created with <a href="git-mktag.html">git-mktag(1)</a>,
\r
1718 its data can be accessed by <a href="git-cat-file.html">git-cat-file(1)</a>,
\r
1719 and the signature can be verified by
\r
1720 <a href="git-verify-tag.html">git-verify-tag(1)</a>.</p>
\r
1722 <h2>The "index" aka "Current Directory Cache"</h2>
\r
1723 <div class="sectionbody">
\r
1724 <p>The index is a simple binary file, which contains an efficient
\r
1725 representation of a virtual directory content at some random time. It
\r
1726 does so by a simple array that associates a set of names, dates,
\r
1727 permissions and content (aka "blob") objects together. The cache is
\r
1728 always kept ordered by name, and names are unique (with a few very
\r
1729 specific rules) at any point in time, but the cache has no long-term
\r
1730 meaning, and can be partially updated at any time.</p>
\r
1731 <p>In particular, the index certainly does not need to be consistent with
\r
1732 the current directory contents (in fact, most operations will depend on
\r
1733 different ways to make the index <em>not</em> be consistent with the directory
\r
1734 hierarchy), but it has three very important attributes:</p>
\r
1735 <p><em>(a) it can re-generate the full state it caches (not just the
\r
1736 directory structure: it contains pointers to the "blob" objects so
\r
1737 that it can regenerate the data too)</em></p>
\r
1738 <p>As a special case, there is a clear and unambiguous one-way mapping
\r
1739 from a current directory cache to a "tree object", which can be
\r
1740 efficiently created from just the current directory cache without
\r
1741 actually looking at any other data. So a directory cache at any one
\r
1742 time uniquely specifies one and only one "tree" object (but has
\r
1743 additional data to make it easy to match up that tree object with what
\r
1744 has happened in the directory)</p>
\r
1745 <p><em>(b) it has efficient methods for finding inconsistencies between that
\r
1746 cached state ("tree object waiting to be instantiated") and the
\r
1747 current state.</em></p>
\r
1748 <p><em>(c) it can additionally efficiently represent information about merge
\r
1749 conflicts between different tree objects, allowing each pathname to be
\r
1750 associated with sufficient information about the trees involved that
\r
1751 you can create a three-way merge between them.</em></p>
\r
1752 <p>Those are the three ONLY things that the directory cache does. It's a
\r
1753 cache, and the normal operation is to re-generate it completely from a
\r
1754 known tree object, or update/compare it with a live tree that is being
\r
1755 developed. If you blow the directory cache away entirely, you generally
\r
1756 haven't lost any information as long as you have the name of the tree
\r
1757 that it described.</p>
\r
1758 <p>At the same time, the index is at the same time also the
\r
1759 staging area for creating new trees, and creating a new tree always
\r
1760 involves a controlled modification of the index file. In particular,
\r
1761 the index file can have the representation of an intermediate tree that
\r
1762 has not yet been instantiated. So the index can be thought of as a
\r
1763 write-back cache, which can contain dirty information that has not yet
\r
1764 been written back to the backing store.</p>
\r
1766 <h2>The Workflow</h2>
\r
1767 <div class="sectionbody">
\r
1768 <p>Generally, all "git" operations work on the index file. Some operations
\r
1769 work <strong>purely</strong> on the index file (showing the current state of the
\r
1770 index), but most operations move data to and from the index file. Either
\r
1771 from the database or from the working directory. Thus there are four
\r
1772 main combinations:</p>
\r
1773 <h3>1) working directory -> index</h3>
\r
1774 <p>You update the index with information from the working directory with
\r
1775 the <a href="git-update-index.html">git-update-index(1)</a> command. You
\r
1776 generally update the index information by just specifying the filename
\r
1777 you want to update, like so:</p>
\r
1778 <div class="literalblock">
\r
1779 <div class="content">
\r
1780 <pre><tt>git-update-index filename</tt></pre>
\r
1782 <p>but to avoid common mistakes with filename globbing etc, the command
\r
1783 will not normally add totally new entries or remove old entries,
\r
1784 i.e. it will normally just update existing cache entries.</p>
\r
1785 <p>To tell git that yes, you really do realize that certain files no
\r
1786 longer exist, or that new files should be added, you
\r
1787 should use the <tt>--remove</tt> and <tt>--add</tt> flags respectively.</p>
\r
1788 <p>NOTE! A <tt>--remove</tt> flag does <em>not</em> mean that subsequent filenames will
\r
1789 necessarily be removed: if the files still exist in your directory
\r
1790 structure, the index will be updated with their new status, not
\r
1791 removed. The only thing <tt>--remove</tt> means is that update-cache will be
\r
1792 considering a removed file to be a valid thing, and if the file really
\r
1793 does not exist any more, it will update the index accordingly.</p>
\r
1794 <p>As a special case, you can also do <tt>git-update-index --refresh</tt>, which
\r
1795 will refresh the "stat" information of each index to match the current
\r
1796 stat information. It will <em>not</em> update the object status itself, and
\r
1797 it will only update the fields that are used to quickly test whether
\r
1798 an object still matches its old backing store object.</p>
\r
1799 <h3>2) index -> object database</h3>
\r
1800 <p>You write your current index file to a "tree" object with the program</p>
\r
1801 <div class="literalblock">
\r
1802 <div class="content">
\r
1803 <pre><tt>git-write-tree</tt></pre>
\r
1805 <p>that doesn't come with any options - it will just write out the
\r
1806 current index into the set of tree objects that describe that state,
\r
1807 and it will return the name of the resulting top-level tree. You can
\r
1808 use that tree to re-generate the index at any time by going in the
\r
1809 other direction:</p>
\r
1810 <h3>3) object database -> index</h3>
\r
1811 <p>You read a "tree" file from the object database, and use that to
\r
1812 populate (and overwrite - don't do this if your index contains any
\r
1813 unsaved state that you might want to restore later!) your current
\r
1814 index. Normal operation is just</p>
\r
1815 <div class="literalblock">
\r
1816 <div class="content">
\r
1817 <pre><tt>git-read-tree <sha1 of tree></tt></pre>
\r
1819 <p>and your index file will now be equivalent to the tree that you saved
\r
1820 earlier. However, that is only your <em>index</em> file: your working
\r
1821 directory contents have not been modified.</p>
\r
1822 <h3>4) index -> working directory</h3>
\r
1823 <p>You update your working directory from the index by "checking out"
\r
1824 files. This is not a very common operation, since normally you'd just
\r
1825 keep your files updated, and rather than write to your working
\r
1826 directory, you'd tell the index files about the changes in your
\r
1827 working directory (i.e. <tt>git-update-index</tt>).</p>
\r
1828 <p>However, if you decide to jump to a new version, or check out somebody
\r
1829 else's version, or just restore a previous tree, you'd populate your
\r
1830 index file with read-tree, and then you need to check out the result
\r
1832 <div class="literalblock">
\r
1833 <div class="content">
\r
1834 <pre><tt>git-checkout-index filename</tt></pre>
\r
1836 <p>or, if you want to check out all of the index, use <tt>-a</tt>.</p>
\r
1837 <p>NOTE! git-checkout-index normally refuses to overwrite old files, so
\r
1838 if you have an old version of the tree already checked out, you will
\r
1839 need to use the "-f" flag (<em>before</em> the "-a" flag or the filename) to
\r
1840 <em>force</em> the checkout.</p>
\r
1841 <p>Finally, there are a few odds and ends which are not purely moving
\r
1842 from one representation to the other:</p>
\r
1843 <h3>5) Tying it all together</h3>
\r
1844 <p>To commit a tree you have instantiated with "git-write-tree", you'd
\r
1845 create a "commit" object that refers to that tree and the history
\r
1846 behind it - most notably the "parent" commits that preceded it in
\r
1848 <p>Normally a "commit" has one parent: the previous state of the tree
\r
1849 before a certain change was made. However, sometimes it can have two
\r
1850 or more parent commits, in which case we call it a "merge", due to the
\r
1851 fact that such a commit brings together ("merges") two or more
\r
1852 previous states represented by other commits.</p>
\r
1853 <p>In other words, while a "tree" represents a particular directory state
\r
1854 of a working directory, a "commit" represents that state in "time",
\r
1855 and explains how we got there.</p>
\r
1856 <p>You create a commit object by giving it the tree that describes the
\r
1857 state at the time of the commit, and a list of parents:</p>
\r
1858 <div class="literalblock">
\r
1859 <div class="content">
\r
1860 <pre><tt>git-commit-tree <tree> -p <parent> [-p <parent2> ..]</tt></pre>
\r
1862 <p>and then giving the reason for the commit on stdin (either through
\r
1863 redirection from a pipe or file, or by just typing it at the tty).</p>
\r
1864 <p>git-commit-tree will return the name of the object that represents
\r
1865 that commit, and you should save it away for later use. Normally,
\r
1866 you'd commit a new <tt>HEAD</tt> state, and while git doesn't care where you
\r
1867 save the note about that state, in practice we tend to just write the
\r
1868 result to the file pointed at by <tt>.git/HEAD</tt>, so that we can always see
\r
1869 what the last committed state was.</p>
\r
1870 <p>Here is an ASCII art by Jon Loeliger that illustrates how
\r
1871 various pieces fit together.</p>
\r
1872 <div class="listingblock">
\r
1873 <div class="content">
\r
1899 checkout-index -u | | checkout-index
\r
1908 <h3>6) Examining the data</h3>
\r
1909 <p>You can examine the data represented in the object database and the
\r
1910 index with various helper tools. For every object, you can use
\r
1911 <a href="git-cat-file.html">git-cat-file(1)</a> to examine details about the
\r
1913 <div class="literalblock">
\r
1914 <div class="content">
\r
1915 <pre><tt>git-cat-file -t <objectname></tt></pre>
\r
1917 <p>shows the type of the object, and once you have the type (which is
\r
1918 usually implicit in where you find the object), you can use</p>
\r
1919 <div class="literalblock">
\r
1920 <div class="content">
\r
1921 <pre><tt>git-cat-file blob|tree|commit|tag <objectname></tt></pre>
\r
1923 <p>to show its contents. NOTE! Trees have binary content, and as a result
\r
1924 there is a special helper for showing that content, called
\r
1925 <tt>git-ls-tree</tt>, which turns the binary content into a more easily
\r
1926 readable form.</p>
\r
1927 <p>It's especially instructive to look at "commit" objects, since those
\r
1928 tend to be small and fairly self-explanatory. In particular, if you
\r
1929 follow the convention of having the top commit name in <tt>.git/HEAD</tt>,
\r
1931 <div class="literalblock">
\r
1932 <div class="content">
\r
1933 <pre><tt>git-cat-file commit HEAD</tt></pre>
\r
1935 <p>to see what the top commit was.</p>
\r
1936 <h3>7) Merging multiple trees</h3>
\r
1937 <p>Git helps you do a three-way merge, which you can expand to n-way by
\r
1938 repeating the merge procedure arbitrary times until you finally
\r
1939 "commit" the state. The normal situation is that you'd only do one
\r
1940 three-way merge (two parents), and commit it, but if you like to, you
\r
1941 can do multiple parents in one go.</p>
\r
1942 <p>To do a three-way merge, you need the two sets of "commit" objects
\r
1943 that you want to merge, use those to find the closest common parent (a
\r
1944 third "commit" object), and then use those commit objects to find the
\r
1945 state of the directory ("tree" object) at these points.</p>
\r
1946 <p>To get the "base" for the merge, you first look up the common parent
\r
1947 of two commits with</p>
\r
1948 <div class="literalblock">
\r
1949 <div class="content">
\r
1950 <pre><tt>git-merge-base <commit1> <commit2></tt></pre>
\r
1952 <p>which will return you the commit they are both based on. You should
\r
1953 now look up the "tree" objects of those commits, which you can easily
\r
1954 do with (for example)</p>
\r
1955 <div class="literalblock">
\r
1956 <div class="content">
\r
1957 <pre><tt>git-cat-file commit <commitname> | head -1</tt></pre>
\r
1959 <p>since the tree object information is always the first line in a commit
\r
1961 <p>Once you know the three trees you are going to merge (the one
\r
1962 "original" tree, aka the common case, and the two "result" trees, aka
\r
1963 the branches you want to merge), you do a "merge" read into the
\r
1964 index. This will complain if it has to throw away your old index contents, so you should
\r
1965 make sure that you've committed those - in fact you would normally
\r
1966 always do a merge against your last commit (which should thus match
\r
1967 what you have in your current index anyway).</p>
\r
1968 <p>To do the merge, do</p>
\r
1969 <div class="literalblock">
\r
1970 <div class="content">
\r
1971 <pre><tt>git-read-tree -m -u <origtree> <yourtree> <targettree></tt></pre>
\r
1973 <p>which will do all trivial merge operations for you directly in the
\r
1974 index file, and you can just write the result out with
\r
1975 <tt>git-write-tree</tt>.</p>
\r
1976 <p>Historical note. We did not have <tt>-u</tt> facility when this
\r
1977 section was first written, so we used to warn that
\r
1978 the merge is done in the index file, not in your
\r
1979 working tree, and your working tree will not match your
\r
1980 index after this step.
\r
1981 This is no longer true. The above command, thanks to <tt>-u</tt>
\r
1982 option, updates your working tree with the merge results for
\r
1983 paths that have been trivially merged.</p>
\r
1984 <h3>8) Merging multiple trees, continued</h3>
\r
1985 <p>Sadly, many merges aren't trivial. If there are files that have
\r
1986 been added.moved or removed, or if both branches have modified the
\r
1987 same file, you will be left with an index tree that contains "merge
\r
1988 entries" in it. Such an index tree can <em>NOT</em> be written out to a tree
\r
1989 object, and you will have to resolve any such merge clashes using
\r
1990 other tools before you can write out the result.</p>
\r
1991 <p>You can examine such index state with <tt>git-ls-files --unmerged</tt>
\r
1992 command. An example:</p>
\r
1993 <div class="listingblock">
\r
1994 <div class="content">
\r
1995 <pre><tt>$ git-read-tree -m $orig HEAD $target
\r
1996 $ git-ls-files --unmerged
\r
1997 100644 263414f423d0e4d70dae8fe53fa34614ff3e2860 1 hello.c
\r
1998 100644 06fa6a24256dc7e560efa5687fa84b51f0263c3a 2 hello.c
\r
1999 100644 cc44c73eb783565da5831b4d820c962954019b69 3 hello.c</tt></pre>
\r
2001 <p>Each line of the <tt>git-ls-files --unmerged</tt> output begins with
\r
2002 the blob mode bits, blob SHA1, <em>stage number</em>, and the
\r
2003 filename. The <em>stage number</em> is git's way to say which tree it
\r
2004 came from: stage 1 corresponds to <tt>$orig</tt> tree, stage 2 <tt>HEAD</tt>
\r
2005 tree, and stage3 <tt>$target</tt> tree.</p>
\r
2006 <p>Earlier we said that trivial merges are done inside
\r
2007 <tt>git-read-tree -m</tt>. For example, if the file did not change
\r
2008 from <tt>$orig</tt> to <tt>HEAD</tt> nor <tt>$target</tt>, or if the file changed
\r
2009 from <tt>$orig</tt> to <tt>HEAD</tt> and <tt>$orig</tt> to <tt>$target</tt> the same way,
\r
2010 obviously the final outcome is what is in <tt>HEAD</tt>. What the
\r
2011 above example shows is that file <tt>hello.c</tt> was changed from
\r
2012 <tt>$orig</tt> to <tt>HEAD</tt> and <tt>$orig</tt> to <tt>$target</tt> in a different way.
\r
2013 You could resolve this by running your favorite 3-way merge
\r
2014 program, e.g. <tt>diff3</tt> or <tt>merge</tt>, on the blob objects from
\r
2015 these three stages yourself, like this:</p>
\r
2016 <div class="listingblock">
\r
2017 <div class="content">
\r
2018 <pre><tt>$ git-cat-file blob 263414f... >hello.c~1
\r
2019 $ git-cat-file blob 06fa6a2... >hello.c~2
\r
2020 $ git-cat-file blob cc44c73... >hello.c~3
\r
2021 $ merge hello.c~2 hello.c~1 hello.c~3</tt></pre>
\r
2023 <p>This would leave the merge result in <tt>hello.c~2</tt> file, along
\r
2024 with conflict markers if there are conflicts. After verifying
\r
2025 the merge result makes sense, you can tell git what the final
\r
2026 merge result for this file is by:</p>
\r
2027 <div class="literalblock">
\r
2028 <div class="content">
\r
2029 <pre><tt>mv -f hello.c~2 hello.c
\r
2030 git-update-index hello.c</tt></pre>
\r
2032 <p>When a path is in unmerged state, running <tt>git-update-index</tt> for
\r
2033 that path tells git to mark the path resolved.</p>
\r
2034 <p>The above is the description of a git merge at the lowest level,
\r
2035 to help you understand what conceptually happens under the hood.
\r
2036 In practice, nobody, not even git itself, uses three <tt>git-cat-file</tt>
\r
2037 for this. There is <tt>git-merge-index</tt> program that extracts the
\r
2038 stages to temporary files and calls a "merge" script on it:</p>
\r
2039 <div class="literalblock">
\r
2040 <div class="content">
\r
2041 <pre><tt>git-merge-index git-merge-one-file hello.c</tt></pre>
\r
2043 <p>and that is what higher level <tt>git resolve</tt> is implemented with.</p>
\r
2046 <div class="sectionbody">
\r
2050 git's founding father is Linus Torvalds <torvalds@osdl.org>.
\r
2055 The current git nurse is Junio C Hamano <junkio@cox.net>.
\r
2060 The git potty was written by Andres Ericsson <ae@op5.se>.
\r
2065 General upbringing is handled by the git-list <git@vger.kernel.org>.
\r
2070 <h2>Documentation</h2>
\r
2071 <div class="sectionbody">
\r
2072 <p>The documentation for git suite was started by David Greaves
\r
2073 <david@dgreaves.com>, and later enhanced greatly by the
\r
2074 contributors on the git-list <git@vger.kernel.org>.</p>
\r
2077 <div class="sectionbody">
\r
2078 <p>Part of the <a href="git.html">git(7)</a> suite</p>
\r
2081 <div id="footer-text">
\r
2082 Last updated 13-Apr-2006 07:45:04 UTC
\r
projects / git.git / blob