mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
c33ab0dd100d91d417b5ed3378acbf3310c07cec
git/Documentation
History
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
Add Documentation/howto/setup-git-server-over-http.txt
2006-08-10 15:07:11 -07:00
technical
Documentation/technical/racy-git.txt
2006-08-15 21:32:54 -07:00
.gitignore
…
asciidoc.conf
escape tilde in Documentation/git-rev-parse.txt
2006-10-03 01:04:19 -07:00
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
Add git-annotate(1) and git-blame(1)
2006-04-18 12:06:55 -07:00
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-archive: update documentation
2006-09-25 21:17:43 -07:00
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
cat-file: document -p option
2006-05-24 22:29:23 -07:00
git-check-ref-format.txt
Some doc typo fixes
2006-06-07 11:49:35 -07:00
git-checkout-index.txt
Fix up docs where "--" isn't displayed correctly.
2006-05-05 14:21:52 -07:00
git-checkout.txt
Merge branch 'master' into sp/reflog
2006-05-24 16:49:24 -07:00
git-cherry-pick.txt
cherry-pick: make -r the default
2006-10-05 17:54:14 -07:00
git-cherry.txt
git-cherry: document limit and add diagram
2006-10-26 18:53:18 -07:00
git-clean.txt
Teach git-clean optional <paths>... parameters.
2006-05-08 16:40:45 -07:00
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
builtin-count-objects: make it official.
2006-05-01 23:06:06 -07:00
git-cvsexportcommit.txt
cvsexportcommit - add -a (add author line) flag, cleanup warnings
2006-07-23 22:51:14 -07:00
git-cvsimport.txt
Documentation: convert uses of git-link macro to gitlink
2006-08-02 11:32:04 -07:00
git-cvsserver.txt
git-cvsserver asciidoc formatting tweaks
2006-06-07 16:32:50 -07:00
git-daemon.txt
Documentation: add git in /etc/services.
2006-10-27 02:10:52 -07:00
git-describe.txt
Some doc typo fixes
2006-06-07 11:49:35 -07:00
git-diff-files.txt
Assorted typo fixes
2006-07-09 02:42:41 -07:00
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
Add option to set initial In-Reply-To/References
2006-07-14 20:41:37 -07:00
git-fsck-objects.txt
Documentation: Spelling fixes
2006-06-03 23:54:55 -07:00
git-get-tar-commit-id.txt
…
git-grep.txt
grep --all-match
2006-09-27 23:59:09 -07:00
git-hash-object.txt
…
git-http-fetch.txt
Teach git-http-fetch the --stdin switch
2006-07-27 19:33:48 -07:00
git-http-push.txt
Documentation: add missing second colons and remove a typo
2006-10-12 09:42:36 -07:00
git-imap-send.txt
Several trivial documentation touch ups.
2006-05-05 14:21:18 -07:00
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
Document receive.denyNonFastforwards
2006-09-20 23:32:22 -07:00
git-instaweb.txt
Add git-instaweb, instantly browse the working repo with gitweb
2006-07-01 18:29:26 -07:00
git-local-fetch.txt
Teach git-local-fetch the --stdin switch
2006-07-27 19:33:48 -07:00
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
Documentation about exclude/ignore files
2006-07-13 21:52:42 -07:00
git-ls-remote.txt
git-ls-remote(1): document --upload-pack
2006-08-25 19:25:58 -07:00
git-ls-tree.txt
Documentation: git-ls-tree (typofix)
2006-06-07 16:29:36 -07:00
git-mailinfo.txt
…
git-mailsplit.txt
Assorted typo fixes
2006-07-09 02:42:41 -07:00
git-merge-base.txt
Update the documentation for git-merge-base
2006-05-15 23:19:46 -07:00
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
Documentation: add a couple of missing docs.
2006-04-13 00:21:06 -07:00
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
Documentation: add a couple of missing docs.
2006-04-13 00:21:06 -07:00
git-mv.txt
…
git-name-rev.txt
typofix (git-name-rev documentation)
2006-07-11 12:45:20 -07:00
git-p4import.txt
Assorted typo fixes
2006-07-09 02:42:41 -07:00
git-pack-objects.txt
git-pack-objects progress flag documentation and cleanup
2006-11-07 16:05:37 -08:00
git-pack-redundant.txt
Assorted typo fixes
2006-07-09 02:42:41 -07:00
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
Documentation: Spelling fixes
2006-06-03 23:54:55 -07:00
git-peek-remote.txt
…
git-prune-packed.txt
…
git-prune.txt
Fix up docs where "--" isn't displayed correctly.
2006-05-05 14:21:52 -07:00
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
Implement a --dry-run option to git-quiltimport
2006-05-18 22:55:57 -07:00
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
Document receive.denyNonFastforwards
2006-09-20 23:32:22 -07:00
git-relink.txt
…
git-repack.txt
Merge branch 'np/pack'
2006-10-22 22:51:42 -07:00
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
Fix up docs where "--" isn't displayed correctly.
2006-05-05 14:21:52 -07:00
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
Documentation: add missing second colons and remove a typo
2006-10-12 09:42:36 -07:00
git-sh-setup.txt
Documentation: Spelling fixes
2006-06-03 23:54:55 -07:00
git-shell.txt
…
git-shortlog.txt
Build in shortlog
2006-11-19 22:59:05 -08:00
git-show-branch.txt
show-branch: match documentation and usage
2006-07-06 19:29:00 -07:00
git-show-index.txt
…
git-show-ref.txt
show-ref --hash=len, --abbrev=len, and --abbrev
2006-10-01 00:32:44 -07:00
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
Documentation: git-status takes the same options as git-commit
2006-08-08 21:55:05 -07:00
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
Fix multi-paragraph list items in OPTIONS section
2006-03-20 14:37:33 -08:00
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
Remove upload-tar and make git-tar-tree a thin wrapper to git-archive
2006-09-24 19:55:08 -07:00
git-tools.txt
Assorted typo fixes
2006-07-09 02:42:41 -07:00
git-unpack-file.txt
…
git-unpack-objects.txt
unpack-objects -r: call it "recover".
2006-09-13 12:59:49 -07:00
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
update-ref: -d flag and ref creation safety.
2006-09-27 02:01:42 -07:00
git-update-server-info.txt
…
git-upload-archive.txt
Add git-upload-archive
2006-09-09 11:57:37 -07:00
git-upload-pack.txt
Retire git-clone-pack
2006-06-21 02:34:14 -07:00
git-var.txt
Deprecate usage of git-var -l for getting config vars list
2006-04-24 22:29:36 -07:00
git-verify-pack.txt
Fix up docs where "--" isn't displayed correctly.
2006-05-05 14:21:52 -07:00
git-verify-tag.txt
…
git-whatchanged.txt
Fix up docs where "--" isn't displayed correctly.
2006-05-05 14:21:52 -07:00
git-write-tree.txt
write-tree: --prefix=<path>
2006-05-01 22:29:16 -07:00
git.txt
Document git-merge-file
2006-12-16 05:15:28 -08:00
gitk.txt
gitk(1): mention --all
2006-09-20 09:00:14 -07:00
glossary.txt
Documentation: Define symref and update HEAD description
2006-11-18 14:04:51 -08:00
hooks.txt
Fix trivial typos and inconsistencies in hooks documentation
2006-09-20 08:36:12 -07:00
howto-index.sh
…
install-webdoc.sh
Documentation/Makefile: create tarballs for the man pages and html files
2006-05-18 20:15:45 -07:00
Makefile
no need to install manpages as executable
2006-12-11 11:32:50 -08:00
merge-options.txt
git-merge --squash
2006-06-24 01:11:19 -07:00
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
Added definitions for a few words:
2006-05-03 22:31:50 -07:00
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
Documentation for the [remote] config
2006-10-23 13:19:49 -07:00