kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
git/Documentation
History
Junio C Hamano 566c511195 Document that merge strategies can now take their own options 
Also document the recently added -Xtheirs, -Xours and -Xsubtree[=path]
options to the merge-recursive strategy.

Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 		2010-01-17 22:46:28 -08:00
..
howto
…
pt_BR
…
technical Merge branch 'maint' 2009-11-22 19:04:30 -08:00
.gitattributes
…
.gitignore
…
CodingGuidelines
…
Makefile Merge branch 'tr/maint-roff-quote' into maint 2009-11-15 16:38:36 -08:00
RelNotes-1.5.0.1.txt
…
RelNotes-1.5.0.2.txt
…
RelNotes-1.5.0.3.txt
…
RelNotes-1.5.0.4.txt
…
RelNotes-1.5.0.5.txt
…
RelNotes-1.5.0.6.txt
…
RelNotes-1.5.0.7.txt
…
RelNotes-1.5.0.txt
…
RelNotes-1.5.1.1.txt
…
RelNotes-1.5.1.2.txt
…
RelNotes-1.5.1.3.txt
…
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
…
RelNotes-1.5.2.3.txt
…
RelNotes-1.5.2.4.txt
…
RelNotes-1.5.2.5.txt
…
RelNotes-1.5.2.txt
…
RelNotes-1.5.3.1.txt
…
RelNotes-1.5.3.2.txt
…
RelNotes-1.5.3.3.txt
…
RelNotes-1.5.3.4.txt
…
RelNotes-1.5.3.5.txt
…
RelNotes-1.5.3.6.txt
…
RelNotes-1.5.3.7.txt
…
RelNotes-1.5.3.8.txt
…
RelNotes-1.5.3.txt
…
RelNotes-1.5.4.1.txt
…
RelNotes-1.5.4.2.txt
…
RelNotes-1.5.4.3.txt
…
RelNotes-1.5.4.4.txt
…
RelNotes-1.5.4.5.txt
…
RelNotes-1.5.4.6.txt
…
RelNotes-1.5.4.7.txt
…
RelNotes-1.5.4.txt
…
RelNotes-1.5.5.1.txt
…
RelNotes-1.5.5.2.txt
…
RelNotes-1.5.5.3.txt
…
RelNotes-1.5.5.4.txt
…
RelNotes-1.5.5.5.txt
…
RelNotes-1.5.5.6.txt
…
RelNotes-1.5.5.txt
…
RelNotes-1.5.6.1.txt
…
RelNotes-1.5.6.2.txt
…
RelNotes-1.5.6.3.txt
…
RelNotes-1.5.6.4.txt
…
RelNotes-1.5.6.5.txt
…
RelNotes-1.5.6.6.txt
…
RelNotes-1.5.6.txt
…
RelNotes-1.6.0.1.txt
…
RelNotes-1.6.0.2.txt
…
RelNotes-1.6.0.3.txt
…
RelNotes-1.6.0.4.txt
…
RelNotes-1.6.0.5.txt
…
RelNotes-1.6.0.6.txt
…
RelNotes-1.6.0.txt
…
RelNotes-1.6.1.1.txt
…
RelNotes-1.6.1.2.txt
…
RelNotes-1.6.1.3.txt
…
RelNotes-1.6.1.4.txt
…
RelNotes-1.6.1.txt
…
RelNotes-1.6.2.1.txt
…
RelNotes-1.6.2.2.txt
…
RelNotes-1.6.2.3.txt
…
RelNotes-1.6.2.4.txt
…
RelNotes-1.6.2.5.txt
…
RelNotes-1.6.2.txt
…
RelNotes-1.6.3.1.txt
…
RelNotes-1.6.3.2.txt
…
RelNotes-1.6.3.3.txt
…
RelNotes-1.6.3.4.txt
…
RelNotes-1.6.3.txt
…
RelNotes-1.6.4.1.txt
…
RelNotes-1.6.4.2.txt
…
RelNotes-1.6.4.3.txt
…
RelNotes-1.6.4.4.txt
…
RelNotes-1.6.4.txt
…
RelNotes-1.6.5.1.txt
…
RelNotes-1.6.5.2.txt
…
RelNotes-1.6.5.3.txt Git 1.6.5.3 2009-11-16 00:05:12 -08:00
RelNotes-1.6.5.txt
…
RelNotes-1.6.6.txt Update draft release notes to 1.6.6 before merging topics for -rc1 2009-11-28 11:13:59 -08:00
SubmittingPatches
…
asciidoc.conf
…
blame-options.txt
…
build-docdep.perl
…
cat-texi.perl
…
cmd-list.perl
…
config.txt Merge branch 'mm/maint-hint-failed-merge' 2009-11-23 22:31:51 -08:00
diff-format.txt
…
diff-generate-patch.txt
…
diff-options.txt Fix over-simplified documentation for 'git log -z' 2009-11-23 01:21:51 -08:00
docbook-xsl.css
…
docbook.xsl
…
everyday.txt
…
fetch-options.txt
…
fix-texi.perl
…
git-add.txt
…
git-am.txt
…
git-annotate.txt
…
git-apply.txt apply: Use the term "working tree" consistently 2009-11-22 12:08:08 -08:00
git-archimport.txt
…
git-archive.txt
…
git-bisect.txt
…
git-blame.txt
…
git-branch.txt
…
git-bundle.txt
…
git-cat-file.txt
…
git-check-attr.txt
…
git-check-ref-format.txt
…
git-checkout-index.txt
…
git-checkout.txt
…
git-cherry-pick.txt
…
git-cherry.txt
…
git-citool.txt
…
git-clean.txt
…
git-clone.txt
…
git-commit-tree.txt
…
git-commit.txt
…
git-config.txt
…
git-count-objects.txt
…
git-cvsexportcommit.txt
…
git-cvsimport.txt
…
git-cvsserver.txt cvsserver doc: database generally can not be reproduced consistently 2009-11-22 22:56:32 -08:00
git-daemon.txt
…
git-describe.txt
…
git-diff-files.txt
…
git-diff-index.txt
…
git-diff-tree.txt
…
git-diff.txt
…
git-difftool.txt
…
git-fast-export.txt
…
git-fast-import.txt
…
git-fetch-pack.txt
…
git-fetch.txt Merge branch 'bg/fetch-multi' 2009-11-23 00:03:15 -08:00
git-filter-branch.txt
…
git-fmt-merge-msg.txt
…
git-for-each-ref.txt
…
git-format-patch.txt
…
git-fsck-objects.txt
…
git-fsck.txt
…
git-gc.txt
…
git-get-tar-commit-id.txt
…
git-grep.txt
…
git-gui.txt
…
git-hash-object.txt
…
git-help.txt
…
git-http-backend.txt
…
git-http-fetch.txt
…
git-http-push.txt
…
git-imap-send.txt
…
git-index-pack.txt
…
git-init-db.txt
…
git-init.txt
…
git-instaweb.txt
…
git-log.txt
…
git-lost-found.txt
…
git-ls-files.txt Merge branch 'jk/maint-1.6.3-ls-files-i' into maint 2009-11-15 23:07:32 -08:00
git-ls-remote.txt
…
git-ls-tree.txt
…
git-mailinfo.txt
…
git-mailsplit.txt
…
git-merge-base.txt
…
git-merge-file.txt git-merge-file --ours, --theirs 2009-11-29 23:11:46 -08:00
git-merge-index.txt
…
git-merge-one-file.txt
…
git-merge-tree.txt
…
git-merge.txt
…
git-mergetool--lib.txt
…
git-mergetool.txt
…
git-mktag.txt
…
git-mktree.txt
…
git-mv.txt
…
git-name-rev.txt
…
git-notes.txt
…
git-pack-objects.txt pack-objects: split implications of --all-progress from progress activation 2009-11-23 21:33:09 -08:00
git-pack-redundant.txt
…
git-pack-refs.txt
…
git-parse-remote.txt
…
git-patch-id.txt
…
git-peek-remote.txt
…
git-prune-packed.txt
…
git-prune.txt
…
git-pull.txt Merge branch 'ja/fetch-doc' into maint 2009-11-15 16:38:18 -08:00
git-push.txt Merge branch 'fc/doc-fast-forward' 2009-11-15 16:41:02 -08:00
git-quiltimport.txt
…
git-read-tree.txt
…
git-rebase.txt Merge branch 'tr/maint-merge-ours-clarification' (early part) 2009-11-22 16:28:06 -08:00
git-receive-pack.txt
…
git-reflog.txt
…
git-relink.txt
…
git-remote-helpers.txt
…
git-remote.txt git remote: Separate usage strings for subcommands 2009-11-20 22:15:30 -08:00
git-repack.txt
…
git-replace.txt Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS 2009-11-20 22:08:11 -08:00
git-repo-config.txt
…
git-request-pull.txt
…
git-rerere.txt
…
git-reset.txt
…
git-rev-list.txt
…
git-rev-parse.txt
…
git-revert.txt
…
git-rm.txt
…
git-send-email.txt
…
git-send-pack.txt
…
git-sh-setup.txt
…
git-shell.txt
…
git-shortlog.txt
…
git-show-branch.txt
…
git-show-index.txt
…
git-show-ref.txt
…
git-show.txt
…
git-stage.txt
…
git-stash.txt
…
git-status.txt
…
git-stripspace.txt
…
git-submodule.txt
…
git-svn.txt Document git-svn's first-parent rule 2009-11-16 23:33:58 -08:00
git-symbolic-ref.txt
…
git-tag.txt
…
git-tar-tree.txt
…
git-tools.txt
…
git-unpack-file.txt
…
git-unpack-objects.txt
…
git-update-index.txt
…
git-update-ref.txt
…
git-update-server-info.txt
…
git-upload-archive.txt
…
git-upload-pack.txt
…
git-var.txt
…
git-verify-pack.txt
…
git-verify-tag.txt
…
git-web--browse.txt
…
git-whatchanged.txt
…
git-write-tree.txt
…
git.txt Sync with 1.6.5.3 2009-11-16 00:06:30 -08:00
gitattributes.txt
…
gitcli.txt
…
gitcore-tutorial.txt t1200: fix a timing dependent error 2009-11-25 00:00:32 -08:00
gitcvs-migration.txt
…
gitdiffcore.txt
…
gitglossary.txt
…
githooks.txt
…
gitignore.txt
…
gitk.txt
…
gitmodules.txt
…
gitrepository-layout.txt
…
gittutorial-2.txt
…
gittutorial.txt
…
gitworkflows.txt gitworkflows: Consistently back-quote git commands 2009-11-26 18:33:34 -08:00
glossary-content.txt
…
howto-index.sh
…
i18n.txt
…
install-doc-quick.sh
…
install-webdoc.sh
…
mailmap.txt
…
manpage-1.72.xsl
…
manpage-base.xsl
…
manpage-bold-literal.xsl
…
manpage-normal.xsl
…
manpage-quote-apos.xsl
…
manpage-suppress-sp.xsl
…
merge-config.txt
…
merge-options.txt Document that merge strategies can now take their own options 2010-01-17 22:46:28 -08:00
merge-strategies.txt Document that merge strategies can now take their own options 2010-01-17 22:46:28 -08:00
pretty-formats.txt strbuf_add_wrapped_text(): skip over colour codes 2009-11-23 15:36:07 -08:00
pretty-options.txt
…
pull-fetch-param.txt Merge branch 'bg/fetch-multi' 2009-11-23 00:03:15 -08:00
rev-list-options.txt Documentation: update descriptions of revision options related to '--bisect' 2009-11-24 01:00:34 -08:00
urls-remotes.txt
…
urls.txt
…
user-manual.conf
…
user-manual.txt Merge branch 'mm/maint-hint-failed-merge' 2009-11-23 22:31:51 -08:00