Johannes Schindelin 9abaa7f033 Document git-merge-file ... Most of this is derived from the documentation of RCS merge. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>		2006-12-16 05:15:28 -08:00
..
howto
technical
.gitignore
asciidoc.conf
build-docdep.perl
callouts.xsl	spurious .sp in manpages	2006-12-13 09:41:18 -08:00
config.txt	Align section headers of 'git status' to new 'git add'.	2006-12-15 22:31:01 -08:00
core-tutorial.txt	Provide more meaningful output from 'git init-db'.	2006-12-15 22:31:00 -08:00
cvs-migration.txt	Documentation: simpler shared repository creation	2006-12-08 20:11:39 -08:00
diff-format.txt	Update documentation to remove incorrect GIT_DIFF_OPTS example.	2006-11-27 12:08:36 -08:00
diff-options.txt	make commit message a little more consistent and conforting	2006-12-15 22:29:54 -08:00
diffcore.txt
everyday.txt	Documentation: add git in /etc/services.	2006-10-27 02:10:52 -07:00
fetch-options.txt
git-add.txt	make 'git add' a first class user friendly interface to the index	2006-12-04 16:33:51 -08:00
git-am.txt
git-annotate.txt
git-apply.txt	git-apply: Documentation typo fix	2006-11-18 11:09:55 -08:00
git-applymbox.txt
git-applypatch.txt
git-archimport.txt
git-archive.txt
git-bisect.txt
git-blame.txt	Documentation: move blame examples	2006-11-09 10:44:56 -08:00
git-branch.txt	git-branch: add options and tests for branch renaming	2006-12-05 23:50:57 -08:00
git-cat-file.txt
git-check-ref-format.txt
git-checkout-index.txt
git-checkout.txt
git-cherry-pick.txt
git-cherry.txt	git-cherry: document limit and add diagram	2006-10-26 18:53:18 -07:00
git-clean.txt
git-clone.txt	git-clone documentation	2006-12-15 23:51:22 -08:00
git-commit-tree.txt
git-commit.txt	make commit message a little more consistent and conforting	2006-12-15 22:29:54 -08:00
git-convert-objects.txt
git-count-objects.txt
git-cvsexportcommit.txt
git-cvsimport.txt
git-cvsserver.txt
git-daemon.txt	Documentation: add git in /etc/services.	2006-10-27 02:10:52 -07:00
git-describe.txt
git-diff-files.txt
git-diff-index.txt	Minor grammar fixes for git-diff-index.txt	2006-11-02 18:03:31 -08:00
git-diff-stages.txt
git-diff-tree.txt	Move --pretty options into Documentation/pretty-formats.txt	2006-11-22 16:06:32 -08:00
git-diff.txt	Make git-diff documentation use [--] when it should.	2006-12-15 22:31:01 -08:00
git-fetch-pack.txt	improve fetch-pack's handling of kept packs	2006-11-03 00:24:07 -08:00
git-fetch.txt
git-fmt-merge-msg.txt
git-for-each-ref.txt	Documentation: fix git-format-patch mark-up and link it from git.txt	2006-10-28 14:25:41 -07:00
git-format-patch.txt
git-fsck-objects.txt
git-get-tar-commit-id.txt
git-grep.txt
git-hash-object.txt
git-http-fetch.txt
git-http-push.txt
git-imap-send.txt
git-index-pack.txt	remove .keep pack lock files when done with refs update	2006-11-03 00:24:07 -08:00
git-init-db.txt
git-instaweb.txt
git-local-fetch.txt
git-log.txt	Move --pretty options into Documentation/pretty-formats.txt	2006-11-22 16:06:32 -08:00
git-lost-found.txt
git-ls-files.txt
git-ls-remote.txt
git-ls-tree.txt
git-mailinfo.txt
git-mailsplit.txt
git-merge-base.txt
git-merge-file.txt	Document git-merge-file	2006-12-16 05:15:28 -08:00
git-merge-index.txt	Get rid of the dependency on RCS' merge program	2006-12-12 21:47:29 -08:00
git-merge-one-file.txt
git-merge-tree.txt
git-merge.txt	git-merge: make it usable as the first class UI	2006-11-21 20:55:40 -08:00
git-mktag.txt
git-mktree.txt
git-mv.txt
git-name-rev.txt
git-p4import.txt
git-pack-objects.txt	git-pack-objects progress flag documentation and cleanup	2006-11-07 16:05:37 -08:00
git-pack-redundant.txt
git-pack-refs.txt	Document git-pack-refs and link it to git(7).	2006-11-06 08:43:34 -08:00
git-parse-remote.txt
git-patch-id.txt
git-peek-remote.txt
git-prune-packed.txt
git-prune.txt
git-pull.txt	Mention that pull can work locally in the synopsis	2006-10-29 12:36:27 -08:00
git-push.txt	git-push: document removal of remote ref with :<dst> pathspec	2006-12-13 01:11:05 -08:00
git-quiltimport.txt
git-read-tree.txt	read-tree: document --exclude-per-directory	2006-12-05 23:44:23 -08:00
git-rebase.txt	Merge branch 'maint'	2006-11-06 22:56:07 -08:00
git-receive-pack.txt
git-relink.txt
git-repack.txt
git-repo-config.txt	Add --add option to git-repo-config	2006-12-15 22:31:01 -08:00
git-request-pull.txt
git-rerere.txt	git-rerere: add 'gc' command.	2006-12-09 11:13:17 -08:00
git-reset.txt	Align section headers of 'git status' to new 'git add'.	2006-12-15 22:31:01 -08:00
git-resolve.txt
git-rev-list.txt	Move --pretty options into Documentation/pretty-formats.txt	2006-11-22 16:06:32 -08:00
git-rev-parse.txt	Merge branch 'jc/pickaxe'	2006-11-07 16:33:59 -08:00
git-revert.txt
git-rm.txt
git-runstatus.txt	Document git-runstatus	2006-11-18 14:04:45 -08:00
git-send-email.txt	git-send-email: Read the default SMTP server from the GIT config file	2006-10-29 12:45:23 -08:00
git-send-pack.txt
git-sh-setup.txt
git-shell.txt
git-shortlog.txt	Build in shortlog	2006-11-19 22:59:05 -08:00
git-show-branch.txt
git-show-index.txt
git-show-ref.txt
git-show.txt	git-show: grok blobs, trees and tags, too	2006-12-14 02:56:24 -08:00
git-ssh-fetch.txt
git-ssh-upload.txt
git-status.txt
git-stripspace.txt
git-svn.txt	git-svn: allow dcommit to take an alternate head	2006-12-12 17:07:05 -08:00
git-svnimport.txt
git-symbolic-ref.txt	De-emphasise the symbolic link documentation.	2006-12-01 21:57:47 -08:00
git-tag.txt
git-tar-tree.txt
git-tools.txt
git-unpack-file.txt
git-unpack-objects.txt
git-update-index.txt	git-update-index(1): fix use of quoting in section title	2006-11-12 18:50:20 -08:00
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-whatchanged.txt
git-write-tree.txt
git.txt	Document git-merge-file	2006-12-16 05:15:28 -08:00
gitk.txt
glossary.txt	Documentation: Define symref and update HEAD description	2006-11-18 14:04:51 -08:00
hooks.txt
howto-index.sh
install-webdoc.sh
Makefile	no need to install manpages as executable	2006-12-11 11:32:50 -08:00
merge-options.txt
merge-strategies.txt
pretty-formats.txt	Move --pretty options into Documentation/pretty-formats.txt	2006-11-22 16:06:32 -08:00
pull-fetch-param.txt
repository-layout.txt	Documentation: Correct alternates documentation, document http-alternates	2006-11-18 16:29:46 -08:00
sort_glossary.pl
SubmittingPatches	Teach SubmittingPatches about git-commit -s	2006-11-21 11:40:18 -08:00
tutorial-2.txt	Align section headers of 'git status' to new 'git add'.	2006-12-15 22:31:01 -08:00
tutorial.txt	Provide more meaningful output from 'git init-db'.	2006-12-15 22:31:00 -08:00
urls.txt