1
0
mirror of https://github.com/git/git.git synced 2024-11-18 06:13:55 +01:00
git/Documentation
Jakub Narebski 0074aba1c0 diff-format.txt: Combined diff format documentation supplement
Update example combined diff format to the current version
$ git diff-tree -p -c fec9ebf16c948bcb4a8b88d0173ee63584bcde76
and provide complete first chunk in example.

Document combined diff format headers: how "diff header" look like,
which of "extended diff headers" are used with combined diff and how
they look like, differences in two-line from-file/to-file header from
non-combined diff format, chunk header format.

It should be noted that combined diff format was designed for quick
_content_ inspection and renames would work correctly to pick which
blobs from each tree to compare but otherwise not reflected in the
output (the pathnames are not shown).

[jc: with minimum copyediting]

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-10-26 00:15:01 -07: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
config.txt Documentation for the [remote] config 2006-10-23 13:19:49 -07:00
core-tutorial.txt Documentation: Fix broken links 2006-09-13 23:39:33 -07:00
cvs-migration.txt Documentation: Fix broken links 2006-09-13 23:39:33 -07:00
diff-format.txt diff-format.txt: Combined diff format documentation supplement 2006-10-26 00:15:01 -07:00
diff-options.txt diff --stat=width[,name-width]: allow custom diffstat output width. 2006-09-28 22:27:29 -07:00
diffcore.txt
everyday.txt Remove --syslog in git-daemon inetd documentation examples. 2006-10-25 22:35:20 -07:00
fetch-options.txt
git-add.txt Document that "git add" only adds non-ignored files. 2006-05-20 18:22:11 -07:00
git-am.txt
git-annotate.txt
git-apply.txt git-apply(1): document --unidiff-zero 2006-09-17 15:08:29 -07: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 git-blame(1): mention options in the synopsis and advertise pickaxe 2006-08-25 19:26:05 -07:00
git-branch.txt Merge branch 'master' into sp/reflog 2006-05-24 16:49:24 -07: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 Update cherry documentation. 2006-10-25 12:56:37 -07:00
git-clean.txt Teach git-clean optional <paths>... parameters. 2006-05-08 16:40:45 -07:00
git-clone.txt Retire git-clone-pack 2006-06-21 02:34:14 -07:00
git-commit-tree.txt
git-commit.txt Minor documentation fixup. 2006-07-01 17:09:01 -07:00
git-convert-objects.txt
git-count-objects.txt
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 Remove --syslog in git-daemon inetd documentation examples. 2006-10-25 22:35:20 -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 Documentation: Spelling fixes 2006-06-03 23:54:55 -07:00
git-diff-stages.txt
git-diff-tree.txt Documentation: Spelling fixes 2006-06-03 23:54:55 -07:00
git-diff.txt change ent to tree in git-diff documentation 2006-07-09 03:26:49 -07:00
git-fetch-pack.txt
git-fetch.txt
git-fmt-merge-msg.txt
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 Document git-grep -[Hh] 2006-09-15 18:37:01 -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
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 Fix up docs where "--" isn't displayed correctly. 2006-05-05 14:21:52 -07: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-index.txt Documentation: Spelling fixes 2006-06-03 23:54:55 -07:00
git-merge-one-file.txt
git-merge-tree.txt
git-merge.txt Assorted typo fixes 2006-07-09 02:42:41 -07:00
git-mktag.txt
git-mktree.txt
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 Add default values for --window and --depth to the docs 2006-10-06 02:53:39 -07:00
git-pack-redundant.txt Assorted typo fixes 2006-07-09 02:42:41 -07: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
git-push.txt git-push: allow -f as an alias for --force 2006-08-02 11:30:42 -07:00
git-quiltimport.txt Implement a --dry-run option to git-quiltimport 2006-05-18 22:55:57 -07:00
git-read-tree.txt Merge branch 'jc/rw-prefix' 2006-06-17 17:56:52 -07:00
git-rebase.txt rebase: allow --skip to work with --merge 2006-06-25 00:38:34 -07:00
git-receive-pack.txt Document receive.denyNonFastforwards 2006-09-20 23:32:22 -07:00
git-relink.txt
git-repack.txt Add default values for --window and --depth to the docs 2006-10-06 02:53:39 -07:00
git-repo-config.txt Merge branch 'master' into pb/gitpm 2006-08-07 17:02:07 -07:00
git-request-pull.txt
git-rerere.txt
git-reset.txt Documentation: Spelling fixes 2006-06-03 23:54:55 -07:00
git-resolve.txt
git-rev-list.txt revision traversal: --author, --committer, and --grep. 2006-09-20 11:14:39 -07:00
git-rev-parse.txt Add revspec documentation for ':path', ':[0-3]:path' and git-describe 2006-10-18 21:43:30 -07:00
git-revert.txt
git-rm.txt Fix up docs where "--" isn't displayed correctly. 2006-05-05 14:21:52 -07:00
git-send-email.txt Check and document the options to prevent mistakes. 2006-06-22 00:20:20 -07: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 Documentation: add missing second colons and remove a typo 2006-10-12 09:42:36 -07:00
git-show-branch.txt show-branch: match documentation and usage 2006-07-06 19:29:00 -07:00
git-show-index.txt Convert usage of GIT and Git into git 2005-10-10 16:01:31 -07:00
git-show.txt
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 Documentation/git-svn: document some of the newer features 2006-10-11 15:24:15 -07:00
git-svnimport.txt
git-symbolic-ref.txt
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 update-index -g 2006-08-23 21:24:47 -07:00
git-update-ref.txt Change order of -m option to update-ref. 2006-05-19 15:03:10 -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
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
git.txt Refer to git-rev-parse:Specifying Revisions from git.txt 2006-10-25 11:33:08 -07:00
gitk.txt gitk(1): mention --all 2006-09-20 09:00:14 -07:00
glossary.txt Documentation: add missing second colons and remove a typo 2006-10-12 09:42:36 -07: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 Documentation: Fix howto/revert-branch-rebase.html generation 2006-09-01 12:41:34 -07:00
merge-options.txt git-merge --squash 2006-06-24 01:11:19 -07:00
merge-strategies.txt
pull-fetch-param.txt
repository-layout.txt Documentation about exclude/ignore files 2006-07-13 21:52:42 -07:00
sort_glossary.pl
SubmittingPatches Documentation/SubmittingPatches: 3+1 != 6 2006-10-25 14:38:24 -07:00
tutorial-2.txt Documentation: Fix broken links 2006-09-13 23:39:33 -07:00
tutorial.txt Some doc typo fixes 2006-06-07 11:49:35 -07:00
urls.txt Documentation for the [remote] config 2006-10-23 13:19:49 -07:00