..
howto
Consistency: Use "libcurl" instead of "cURL library" and "curl"
2008-06-15 13:35:10 -07:00
technical
api-builtin.txt: update and fix typo
2008-06-22 18:14:17 -07:00
.gitattributes
Define the project whitespace policy
2008-02-11 13:23:15 -08:00
.gitignore
doc: adding gitman.info and *.texi to .gitignore
2008-06-12 14:28:53 -07:00
asciidoc.conf
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
blame-options.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
build-docdep.perl
Documentation/build-docdep.perl: Fix dependencies for included asciidoc files
2007-03-01 13:24:54 -08:00
callouts.xsl
Revert "tweak manpage formatting"
2007-08-10 11:32:42 -07:00
cat-texi.perl
Documentation: exclude @pxref{[REMOTES]} from texinfo intermediate output
2008-06-12 14:21:05 -07:00
cmd-list.perl
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
CodingGuidelines
CodingGuidelines: Add a note to avoid assignments inside if()
2008-05-24 22:13:19 -07:00
config.txt
Clearify the documentation for core.ignoreStat
2008-05-31 13:09:39 -07:00
diff-format.txt
git-diff --numstat -z: make it machine readable
2007-12-12 10:59:22 -08:00
diff-generate-patch.txt
Include diff options in the git-log manpage
2007-12-05 01:57:40 -08:00
diff-options.txt
documentation: convert "diffcore" and "repository-layout" to man pages
2008-06-06 11:14:52 -07:00
docbook-xsl.css
War on whitespace
2007-06-07 00:04:01 -07:00
docbook.xsl
Mark user-manual as UTF-8
2007-07-24 00:47:05 -07:00
everyday.txt
git-gc --prune is deprecated
2008-04-22 21:53:37 -07:00
fetch-options.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
fix-texi.perl
Add support for an info version of the user manual
2007-08-10 23:16:18 -07:00
git-add.txt
git add: add long equivalents of '-u' and '-f' options
2008-06-14 12:47:31 -07:00
git-am.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-annotate.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-apply.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-archimport.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-archive.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-bisect.txt
documentation: bisect: remove bits talking about a bisection branch
2008-06-14 10:52:57 -07:00
git-blame.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-branch.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-bundle.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-cat-file.txt
Documentation/git-cat-file.txt: add missing line break
2008-06-09 23:12:48 -07:00
git-check-attr.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-check-ref-format.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-checkout-index.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-checkout.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-cherry-pick.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-cherry.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-citool.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-clean.txt
Docs: add some long/short options
2008-06-08 13:46:38 -07:00
git-clone.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-commit-tree.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-commit.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-config.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-count-objects.txt
Docs: add some long/short options
2008-06-08 13:46:38 -07:00
git-cvsexportcommit.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-cvsimport.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-cvsserver.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-daemon.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-describe.txt
git-describe.txt: document --always
2008-06-08 13:46:38 -07:00
git-diff-files.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-diff-index.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-diff-tree.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-diff.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-fast-export.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-fast-import.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-fetch-pack.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-fetch.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-filter-branch.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-fmt-merge-msg.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-for-each-ref.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-format-patch.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-fsck-objects.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-fsck.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-gc.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-get-tar-commit-id.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-grep.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-gui.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-hash-object.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-help.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-http-fetch.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-http-push.txt
Consistency: Use "libcurl" instead of "cURL library" and "curl"
2008-06-15 13:35:10 -07:00
git-imap-send.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-index-pack.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-init-db.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-init.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-instaweb.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-log.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-lost-found.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-ls-files.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-ls-remote.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-ls-tree.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-mailinfo.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-mailsplit.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-merge-base.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-merge-file.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-merge-index.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-merge-one-file.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-merge-tree.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-merge.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-mergetool.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-mktag.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-mktree.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-mv.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-name-rev.txt
git-name-rev.txt: document --no-undefined and --always
2008-06-08 13:46:38 -07:00
git-pack-objects.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-pack-redundant.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-pack-refs.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-parse-remote.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-patch-id.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-peek-remote.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-prune-packed.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-prune.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-pull.txt
Documentation/git-pull.txt: Use more standard [NOTE] markup
2008-06-12 14:19:09 -07:00
git-push.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-quiltimport.txt
Docs: add some long/short options
2008-06-08 13:46:38 -07:00
git-read-tree.txt
Merge branch 'maint'
2008-06-09 16:13:08 -07:00
git-rebase.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-receive-pack.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-reflog.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-relink.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-remote.txt
remote prune: print the list of pruned branches
2008-06-10 23:17:41 -07:00
git-repack.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-repo-config.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-request-pull.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-rerere.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-reset.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-rev-list.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-rev-parse.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-revert.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-rm.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-send-email.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-send-pack.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-sh-setup.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-shell.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-shortlog.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-show-branch.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-show-index.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-show-ref.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-show.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-stash.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-status.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-stripspace.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-submodule.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-svn.txt
Documentation: fix formatting in git-svn
2008-06-19 16:30:26 -07:00
git-symbolic-ref.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-tag.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-tar-tree.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-tools.txt
Remove outdated references to cogito in documentation
2007-10-29 12:53:50 -07:00
git-unpack-file.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-unpack-objects.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-update-index.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-update-ref.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-update-server-info.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-upload-archive.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-upload-pack.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-var.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-verify-pack.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-verify-tag.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-web--browse.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
git-whatchanged.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git-write-tree.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
git.txt
GIT 1.5.6
2008-06-18 13:09:43 -07:00
gitattributes.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
gitcli.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
gitcore-tutorial.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
gitcvs-migration.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
gitdiffcore.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
gitglossary.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
githooks.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
gitignore.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
gitk.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
gitmodules.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
gitrepository-layout.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
gittutorial-2.txt
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
gittutorial.txt
Merge branch 'maint'
2008-06-11 16:21:56 -07:00
glossary-content.txt
glossary: improve a few links
2008-06-01 22:26:37 -07:00
howto-index.sh
Allow asciidoc formatted documentation in howto/
2005-08-29 22:38:12 -07:00
i18n.txt
Fix grammar nits in documentation and in code comments.
2008-01-03 09:15:17 -08:00
install-doc-quick.sh
Fix "make GZ=1 quick-install-doc"
2007-08-06 21:16:21 -07:00
install-webdoc.sh
Start preparing the API documents.
2007-12-14 22:29:38 -08:00
Makefile
documentation: move git(7) to git(1)
2008-06-06 11:18:28 -07:00
manpage-1.72.xsl
Make man page building quiet when DOCBOOK_XSL_172 is defined
2008-03-15 00:05:18 -07:00
merge-config.txt
add merge.renamelimit config option
2008-05-03 13:39:51 -07:00
merge-options.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
merge-strategies.txt
Documentation/git-merge: document subtree strategy.
2008-03-19 01:43:02 -07:00
pretty-formats.txt
document --pretty=tformat: option
2008-06-12 22:22:36 -07:00
pretty-options.txt
log/show/whatchanged: introduce format.pretty configuration
2008-03-05 12:06:09 -08:00
pull-fetch-param.txt
Clarify description of <repository> argument to pull/fetch for naming remotes.
2008-05-31 14:46:24 -07:00
RelNotes-1.5.0.1.txt
RelNotes-1.5.0.2.txt
GIT 1.5.0.2
2007-02-26 00:26:06 -08:00
RelNotes-1.5.0.3.txt
RelNotes-1.5.0.4.txt
War on whitespace
2007-06-07 00:04:01 -07:00
RelNotes-1.5.0.5.txt
War on whitespace
2007-06-07 00:04:01 -07:00
RelNotes-1.5.0.6.txt
War on whitespace
2007-06-07 00:04:01 -07:00
RelNotes-1.5.0.7.txt
GIT 1.5.0.7
2007-04-03 19:27:41 -07:00
RelNotes-1.5.0.txt
RelNotes-1.5.1.1.txt
RelNotes-1.5.1.2.txt
RelNotes-1.5.1.3.txt
War on whitespace
2007-06-07 00:04:01 -07:00
RelNotes-1.5.1.4.txt
RelNotes-1.5.1.5.txt
RelNotes-1.5.1.6.txt
RelNotes-1.5.1.txt
RelNotes-1.5.2.1.txt
RelNotes-1.5.2.2.txt
GIT 1.5.2.2
2007-06-16 01:13:35 -07:00
RelNotes-1.5.2.3.txt
GIT 1.5.2.3
2007-07-02 00:35:58 -07:00
RelNotes-1.5.2.4.txt
GIT 1.5.2.4
2007-07-12 12:01:47 -07:00
RelNotes-1.5.2.5.txt
GIT 1.5.2.5
2007-08-15 15:01:20 -07:00
RelNotes-1.5.2.txt
RelNotes-1.5.3.1.txt
GIT 1.5.3.1: obsolete git-p4 in RPM spec file.
2007-09-03 01:28:37 -07:00
RelNotes-1.5.3.2.txt
GIT 1.5.3.2
2007-09-19 03:11:28 -07:00
RelNotes-1.5.3.3.txt
fix doc typos
2008-01-29 22:00:34 -08:00
RelNotes-1.5.3.4.txt
GIT 1.5.3.4
2007-10-03 02:33:48 -07:00
RelNotes-1.5.3.5.txt
RelNotes-1.5.3.5: fix another typo
2007-11-07 11:37:15 -08:00
RelNotes-1.5.3.6.txt
GIT 1.5.3.6
2007-11-18 14:00:38 -08:00
RelNotes-1.5.3.7.txt
GIT 1.5.3.7
2007-12-01 11:20:00 -08:00
RelNotes-1.5.3.8.txt
GIT 1.5.3.8
2008-01-07 22:41:43 -08:00
RelNotes-1.5.3.txt
Typofix: 1.5.3 release notes
2007-09-02 15:03:26 -07:00
RelNotes-1.5.4.1.txt
GIT 1.5.4.2
2008-02-17 00:20:38 -08:00
RelNotes-1.5.4.2.txt
GIT 1.5.4.2
2008-02-17 00:20:38 -08:00
RelNotes-1.5.4.3.txt
GIT 1.5.4.3
2008-02-23 11:31:04 -08:00
RelNotes-1.5.4.4.txt
GIT 1.5.4.4
2008-03-08 19:43:21 -08:00
RelNotes-1.5.4.5.txt
GIT 1.5.4.5
2008-03-27 20:36:35 -07:00
RelNotes-1.5.4.txt
GIT 1.5.4
2008-02-01 19:10:10 -08:00
RelNotes-1.5.5.1.txt
GIT 1.5.5.1
2008-04-20 11:36:53 -07:00
RelNotes-1.5.5.2.txt
Release Notes for 1.5.5.2
2008-05-25 21:11:24 -07:00
RelNotes-1.5.5.3.txt
GIT 1.5.5.3
2008-05-27 22:32:47 -07:00
RelNotes-1.5.5.4.txt
GIT 1.5.5.4
2008-06-07 11:45:48 -07:00
RelNotes-1.5.5.txt
GIT 1.5.5
2008-04-07 21:57:43 -07:00
RelNotes-1.5.6.txt
GIT 1.5.6
2008-06-18 13:09:43 -07:00
rev-list-options.txt
Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 13:46:38 -07:00
SubmittingPatches
Documentation/SubmittingPatches - a suggested patch flow
2008-02-16 17:33:31 -08:00
urls-remotes.txt
Clarify description of <repository> argument to pull/fetch for naming remotes.
2008-05-31 14:46:24 -07:00
urls.txt
Add support for url aliases in config files
2008-02-24 20:05:29 -08:00
user-manual.conf
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
user-manual.txt
user-manual: describe how higher stages are set during a merge
2008-06-12 14:30:51 -07:00