mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
2c865d9aa7b9c3511f901b2544b667c5188f510e
git/Documentation
History
Junio C Hamano 0f69be5376 'git-merge': Documentation. 
... and add link from git.txt, as usual.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-10 18:30:42 -07:00
..
howto
Big tool rename.
2005-09-07 17:45:20 -07:00
technical
[PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.
2005-09-10 18:27:41 -07:00
.gitignore
[PATCH] git bugfixes and cleanups, mainly Debian things
2005-08-26 12:54:27 -07:00
cvs-migration.txt
Documentaion updates.
2005-08-30 13:55:34 -07:00
diff-format.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
diff-options.txt
Documentaion updates.
2005-08-30 13:55:34 -07:00
diffcore.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-add.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-apply.txt
[PATCH] apply: match documentation, usage string and code.
2005-07-13 20:53:33 -07:00
git-applymbox.txt
Document hooks.
2005-09-02 22:38:30 -07:00
git-applypatch.txt
Document hooks.
2005-09-02 22:38:30 -07:00
git-archimport.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-bisect.txt
Add 'git bisect replay/log' documentation.
2005-09-10 15:23:09 -07:00
git-branch.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-build-rev-cache.txt
[PATCH] Docs for git-build-rev-cache.
2005-09-07 14:24:41 -07:00
git-cat-file.txt
[PATCH] git-cat-file: '-s' to find out object size.
2005-06-28 08:53:22 -07:00
git-checkout-index.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-checkout.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-cherry-pick.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-cherry.txt
[PATCH] Subject: [PATCH] Add some documentation.
2005-08-26 20:53:50 -07:00
git-clone-pack.txt
[PATCH] Documentation: clone/fetch/upload.
2005-07-14 08:54:31 -07:00
git-clone.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-commit-tree.txt
[PATCH] Update the list of diagnostics for git-commit-tree
2005-07-15 10:00:35 -07:00
git-commit.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-convert-objects.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-count-objects.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-cvsimport.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-daemon.txt
[PATCH] Documentation for git-daemon.
2005-08-29 21:10:08 -07:00
git-diff-files.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-diff-helper.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-diff-index.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-diff-stages.txt
[PATCH] Clean up diff option descriptions.
2005-07-13 13:09:17 -07:00
git-diff-tree.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-diff.txt
Documentation updates.
2005-09-07 23:04:52 -07:00
git-export.txt
[PATCH 1/4] split core-git.txt and update
2005-05-10 14:55:22 -07:00
git-fetch-pack.txt
fetch-pack: start multi-head pulling.
2005-08-12 10:38:21 -07:00
git-fetch.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-format-patch.txt
Documentation updates.
2005-09-07 23:04:52 -07:00
git-fsck-objects.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-get-tar-commit-id.txt
[PATCH] Update documentation for git-get-tar-commit-id
2005-09-06 13:49:11 -07:00
git-hash-object.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-http-fetch.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-init-db.txt
[PATCH] Assorted documentation patches
2005-08-05 23:07:00 -07:00
git-local-fetch.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-log.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-ls-files.txt
[PATCH] Doc: replace read-cache with git-read-tree.
2005-09-04 10:18:45 -07:00
git-ls-remote.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-ls-tree.txt
[PATCH] Assorted documentation patches
2005-08-05 23:07:00 -07:00
git-mailinfo.txt
Accumulated documentation updates.
2005-08-29 17:21:06 -07:00
git-mailsplit.txt
[PATCH] Add some documentation.
2005-08-28 14:32:30 -07:00
git-merge-base.txt
[PATCH 1/4] split core-git.txt and update
2005-05-10 14:55:22 -07:00
git-merge-index.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-merge-one-file.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-merge.txt
'git-merge': Documentation.
2005-09-10 18:30:42 -07:00
git-mktag.txt
[PATCH 3/4] split core-git.txt and update
2005-05-10 15:01:23 -07:00
git-octopus.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-pack-objects.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-parse-remote.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-patch-id.txt
[PATCH] Subject: [PATCH] Add some documentation.
2005-08-26 20:53:50 -07:00
git-peek-remote.txt
[PATCH] Assorted documentation patches
2005-08-05 23:07:00 -07:00
git-prune-packed.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-prune.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-pull.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-push.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-read-tree.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-rebase.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-receive-pack.txt
Document hooks.
2005-09-02 22:38:30 -07:00
git-relink.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-rename.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-repack.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-request-pull.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-reset.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-resolve.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-rev-list.txt
[PATCH] document git-rev-list better
2005-07-29 17:21:53 -07:00
git-rev-parse.txt
Documentation updates.
2005-09-07 14:20:57 -07:00
git-rev-tree.txt
[PATCH 1/4] split core-git.txt and update
2005-05-10 14:55:22 -07:00
git-revert.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-send-email.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-send-pack.txt
Documentation: multi-head fetch.
2005-08-24 16:50:54 -07:00
git-sh-setup.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-shortlog.txt
Documentation updates.
2005-08-14 17:24:36 -07:00
git-show-branch.txt
show-branch: --list and --independent
2005-09-09 16:35:53 -07:00
git-show-index.txt
[PATCH] Documentation: packed GIT support commands.
2005-07-14 08:54:31 -07:00
git-show-rev-cache.txt
[PATCH] Docs for git-show-rev-cache.
2005-09-07 14:24:41 -07:00
git-ssh-fetch.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-ssh-upload.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-status.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-stripspace.txt
Documentation updates.
2005-09-07 23:04:52 -07:00
git-tag.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-tar-tree.txt
[PATCH] Assorted documentation patches
2005-08-05 23:07:00 -07:00
git-unpack-file.txt
[PATCH 1/4] split core-git.txt and update
2005-05-10 14:55:22 -07:00
git-unpack-objects.txt
Update unpack-objects usage and documentation.
2005-08-12 10:38:20 -07:00
git-update-index.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-update-server-info.txt
Add a link from update-server-info documentation to repository layout.
2005-09-04 11:25:56 -07:00
git-upload-pack.txt
[PATCH] Documentation: clone/fetch/upload.
2005-07-14 08:54:31 -07:00
git-var.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-verify-pack.txt
[PATCH] Documentation: packed GIT support commands.
2005-07-14 08:54:31 -07:00
git-verify-tag.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git-whatchanged.txt
Documentation updates.
2005-08-14 17:24:36 -07:00
git-write-tree.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
git.txt
'git-merge': Documentation.
2005-09-10 18:30:42 -07:00
gitk.txt
Add placeholders for missing documents.
2005-08-23 01:49:47 -07:00
glossary.txt
[PATCH] More missing terms in glossary.txt
2005-08-26 11:11:48 -07:00
hooks.txt
Big tool rename.
2005-09-07 17:45:20 -07:00
howto-index.sh
Allow asciidoc formatted documentation in howto/
2005-08-29 22:38:12 -07:00
install-webdoc.sh
Ignore datestamp-only changes when installing webdoc.
2005-09-09 01:17:54 -07:00
Makefile
Document hooks.
2005-09-02 22:38:30 -07:00
pack-protocol.txt
[PATCH] Document two pack push-pull protocols.
2005-07-13 20:42:26 -07:00
pull-fetch-param.txt
Fix markup minimally to get man pages built.
2005-08-24 17:50:05 -07:00
repository-layout.txt
[PATCH] Documentation/repository-layout.txt typo
2005-09-10 03:33:33 -07:00
sort_glossary.pl
[PATCH] Add Makefile target glossary.html
2005-08-18 10:25:52 -07:00
SubmittingPatches
Add Pine 4.63 help from Daniel.
2005-08-31 11:48:41 -07:00
tutorial.txt
[PATCH] fix tutorial typo
2005-09-09 09:59:03 -07:00