git-commit-vandalism/Documentation
René Scharfe 6d0e674a57 diff: add option to show context between close hunks
Merge two hunks if there is only the specified number of otherwise unshown
context between them.  For --inter-hunk-context=1, the resulting patch has
the same number of lines but shows uninterrupted context instead of a
context header line in between.

Patches generated with this option are easier to read but are also more
likely to conflict if the file to be patched contains other changes.

This patch keeps the default for this option at 0.  It is intended to just
make the feature available in order to see its advantages and downsides.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-29 01:05:21 -08:00
..
howto Add a documentat on how to revert a faulty merge 2008-12-21 01:48:07 -08:00
technical Fix typos in documentation 2008-12-09 21:39:23 -08:00
.gitattributes
.gitignore
asciidoc.conf Define linkgit macro in [macros] section 2008-12-08 17:11:37 -08:00
blame-options.txt builtin-blame: Reencode commit messages according to git-log rules. 2008-10-21 14:09:34 -07:00
build-docdep.perl
callouts.xsl
cat-texi.perl
cmd-list.perl
CodingGuidelines
config.txt Make help entries alphabetical 2008-12-21 18:45:05 -08:00
diff-format.txt Documentation: fix typos, grammar, asciidoc syntax 2008-12-19 19:10:46 -08:00
diff-generate-patch.txt Documentation: fix typos, grammar, asciidoc syntax 2008-12-19 19:10:46 -08:00
diff-options.txt diff: add option to show context between close hunks 2008-12-29 01:05:21 -08:00
docbook-xsl.css
docbook.xsl
everyday.txt
fetch-options.txt
fix-texi.perl
git-add.txt Fix typos in the documentation. 2008-11-27 01:17:23 -08:00
git-am.txt
git-annotate.txt Mention the fact that 'git annotate' is only for backward compatibility. 2008-09-05 01:15:40 -07:00
git-apply.txt git-apply:--include=pathspec 2008-09-06 18:56:44 -07:00
git-archimport.txt
git-archive.txt
git-bisect.txt Documentation: describe how to "bisect skip" a range of commits 2008-12-02 15:29:12 -08:00
git-blame.txt
git-branch.txt
git-bundle.txt
git-cat-file.txt
git-check-attr.txt Merge branch 'maint' 2008-11-12 15:03:57 -08:00
git-check-ref-format.txt
git-checkout-index.txt
git-checkout.txt Documentation: sync example output with git output 2008-12-19 11:55:33 -08:00
git-cherry-pick.txt Fix misleading wording for git-cherry-pick 2008-11-23 19:32:39 -08:00
git-cherry.txt
git-citool.txt
git-clean.txt
git-clone.txt Implement git clone -v 2008-10-09 11:26:17 -07:00
git-commit-tree.txt Fix passwd(5) ref and reflect that commit doens't use commit-tree 2008-09-03 14:51:19 -07:00
git-commit.txt Merge branch 'maint' to sync with GIT 1.6.0.6 2008-12-19 19:35:55 -08:00
git-config.txt git-config.txt: fix a typo 2008-12-12 20:39:41 -08:00
git-count-objects.txt
git-cvsexportcommit.txt
git-cvsimport.txt
git-cvsserver.txt
git-daemon.txt git-daemon documentation: use {tilde} 2008-12-17 00:56:36 -08:00
git-describe.txt describe: Make --tags and --all match lightweight tags more often 2008-10-17 11:35:43 -07:00
git-diff-files.txt
git-diff-index.txt
git-diff-tree.txt Documentation: fix typos, grammar, asciidoc syntax 2008-12-19 19:37:18 -08:00
git-diff.txt git-diff: Add --staged as a synonym for --cached. 2008-11-11 14:55:43 -08:00
git-fast-export.txt Merge branch 'maint' to sync with GIT 1.6.0.6 2008-12-19 19:35:55 -08:00
git-fast-import.txt
git-fetch-pack.txt
git-fetch.txt
git-filter-branch.txt Documentation: Refer to git-rebase(1) to warn against rewriting 2008-09-15 21:22:58 -07:00
git-fmt-merge-msg.txt
git-for-each-ref.txt for-each-ref: :short format for refname 2008-09-05 23:06:37 -07:00
git-format-patch.txt Merge branch 'maint' 2008-11-04 15:11:26 -08:00
git-fsck-objects.txt
git-fsck.txt doc/git-fsck: change the way for getting heads' SHA1s 2008-12-21 12:04:12 -08:00
git-gc.txt
git-get-tar-commit-id.txt
git-grep.txt git grep: Add "-z/--null" option as in GNU's grep. 2008-10-01 09:14:54 -07:00
git-gui.txt Documentation: New GUI configuration and command-line options. 2008-11-14 21:38:11 -08:00
git-hash-object.txt
git-help.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 Document "git log --source" 2008-11-11 12:55:42 -08:00
git-lost-found.txt
git-ls-files.txt
git-ls-remote.txt
git-ls-tree.txt
git-mailinfo.txt Documentation: fix typos, grammar, asciidoc syntax 2008-12-19 19:10:46 -08:00
git-mailsplit.txt
git-merge-base.txt Improve language in git-merge.txt and related docs 2008-12-09 20:57:52 -08:00
git-merge-file.txt Improve language in git-merge.txt and related docs 2008-12-09 20:57:52 -08:00
git-merge-index.txt Improve language in git-merge.txt and related docs 2008-12-09 20:57:52 -08:00
git-merge-one-file.txt
git-merge-tree.txt Improve language in git-merge.txt and related docs 2008-12-09 20:57:52 -08:00
git-merge.txt Improve language in git-merge.txt and related docs 2008-12-09 20:57:52 -08:00
git-mergetool.txt Improve language in git-merge.txt and related docs 2008-12-09 20:57:52 -08:00
git-mktag.txt
git-mktree.txt
git-mv.txt
git-name-rev.txt Fix example in git-name-rev documentation 2008-08-30 13:23:01 -07:00
git-pack-objects.txt pack-objects: extend --local to mean ignore non-local loose objects too 2008-11-12 10:29:22 -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 make prune report removed objects on -v 2008-09-30 14:30:00 -07:00
git-pull.txt
git-push.txt git-push.txt: Describe --repo option in more detail 2008-10-08 07:15:53 -07:00
git-quiltimport.txt
git-read-tree.txt Correct typos in RelNotes-1.6.1 2008-09-30 11:51:16 -07:00
git-rebase.txt Merge branch 'tr/workflow-doc' 2008-10-19 16:07:23 -07:00
git-receive-pack.txt Documentation: fix typos, grammar, asciidoc syntax 2008-12-19 19:10:46 -08:00
git-reflog.txt Documentation: fix typos, grammar, asciidoc syntax 2008-12-19 19:10:46 -08:00
git-relink.txt
git-remote.txt git-remote: document the migration feature of the rename subcommand 2008-11-11 20:25:49 -08:00
git-repack.txt repack: only unpack-unreachable if we are deleting redundant packs 2008-11-14 21:39:10 -08:00
git-repo-config.txt
git-request-pull.txt
git-rerere.txt
git-reset.txt Documentation: sync example output with git output 2008-12-19 11:55:33 -08:00
git-rev-list.txt Documentation: remove '\' in front of short options 2008-10-01 08:18:46 -07:00
git-rev-parse.txt
git-revert.txt git-revert documentation: refer to new HOWTO on reverting faulty merges 2008-12-21 18:34:49 -08:00
git-rm.txt
git-send-email.txt git-send-email.txt: move --format-patch paragraph to a proper location 2008-12-27 13:54:00 -08:00
git-send-pack.txt
git-sh-setup.txt
git-shell.txt
git-shortlog.txt git-shortlog.txt: improve documentation about .mailmap files 2008-12-27 13:52:19 -08:00
git-show-branch.txt Documentation/git-show-branch: work around "single quote" typesetting glitch 2008-12-21 02:00:31 -08:00
git-show-index.txt
git-show-ref.txt
git-show.txt
git-stage.txt Add a built-in alias for 'stage' to the 'add' command 2008-12-02 16:13:16 -08:00
git-stash.txt Documentation: minor cleanup in a use case in 'git stash' manual 2008-09-01 22:02:11 -07:00
git-status.txt Update my e-mail address 2008-07-21 12:14:42 -07:00
git-stripspace.txt
git-submodule.txt Merge branch 'maint' to sync with GIT 1.6.0.6 2008-12-19 19:35:55 -08:00
git-svn.txt Merge branch 'rw/maint-typofix' into rw/typofix 2008-11-27 01:17:09 -08:00
git-symbolic-ref.txt
git-tag.txt document that git-tag can tag more than heads 2008-07-25 00:26:44 -07:00
git-tar-tree.txt
git-tools.txt
git-unpack-file.txt
git-unpack-objects.txt
git-update-index.txt Documentation: fix typos, grammar, asciidoc syntax 2008-12-19 19:10:46 -08:00
git-update-ref.txt
git-update-server-info.txt
git-upload-archive.txt
git-upload-pack.txt
git-var.txt Fix passwd(5) ref and reflect that commit doens't use commit-tree 2008-09-03 14:51:19 -07:00
git-verify-pack.txt
git-verify-tag.txt
git-web--browse.txt git-web--browse: Support for using /bin/start on MinGW 2008-09-24 15:49:21 -07:00
git-whatchanged.txt
git-write-tree.txt
git.txt GIT 1.6.1 2008-12-24 19:41:08 -08:00
gitattributes.txt Documentation: New GUI configuration and command-line options. 2008-11-14 21:38:11 -08:00
gitcli.txt
gitcore-tutorial.txt Merge branch 'maint' to sync with GIT 1.6.0.6 2008-12-19 19:35:55 -08:00
gitcvs-migration.txt
gitdiffcore.txt Bust the ghost of long-defunct diffcore-pathspec. 2008-09-19 19:48:30 -07:00
gitglossary.txt Documentation: fix links to "everyday.html" 2008-11-14 21:48:10 -08:00
githooks.txt githooks documentation: add a note about the +x mode 2008-12-17 13:37:14 -08:00
gitignore.txt
gitk.txt Merge branch 'maint' to sync with GIT 1.6.0.6 2008-12-19 19:35:55 -08:00
gitmodules.txt Document clarification: gitmodules, gitattributes 2008-08-31 16:31:58 -07:00
gitrepository-layout.txt Documentation: fix description for enabling hooks 2008-12-17 00:57:33 -08:00
gittutorial-2.txt Documentation: tutorial: add information about "git help" at the beginning 2008-11-17 08:21:34 -08:00
gittutorial.txt Documentation: tutorial: add information about "git help" at the beginning 2008-11-17 08:21:34 -08:00
gitworkflows.txt workflows documentation: fix link to git-request-pull[1] 2008-10-20 23:39:37 -07:00
glossary-content.txt Documentation: fix description for enabling hooks 2008-12-17 00:57:33 -08:00
howto-index.sh
i18n.txt Merge branch 'maint' to sync with GIT 1.6.0.6 2008-12-19 19:35:55 -08:00
install-doc-quick.sh
install-webdoc.sh
Makefile Makefile: add install-man rules (quick and normal) 2008-11-02 20:46:52 -08:00
manpage-1.72.xsl
merge-config.txt Improve language in git-merge.txt and related docs 2008-12-09 20:57:52 -08:00
merge-options.txt Improve language in git-merge.txt and related docs 2008-12-09 20:57:52 -08:00
merge-strategies.txt
pretty-formats.txt Documentation: sync example output with git output 2008-12-19 11:55:33 -08:00
pretty-options.txt
pull-fetch-param.txt
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 GIT 1.5.4.7 2008-12-16 22:06:47 -08:00
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 GIT 1.5.5.6 2008-12-16 22:08:28 -08:00
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 GIT 1.5.6.6 2008-12-16 22:13:36 -08:00
RelNotes-1.5.6.txt
RelNotes-1.6.0.1.txt
RelNotes-1.6.0.2.txt Update draft release notes for 1.6.0.2 2008-09-10 13:38:20 -07:00
RelNotes-1.6.0.3.txt GIT 1.6.0.3 2008-10-21 13:37:42 -07:00
RelNotes-1.6.0.4.txt Fix typos in the documentation. 2008-11-27 01:00:45 -08:00
RelNotes-1.6.0.5.txt GIT 1.6.0.5 2008-12-07 15:11:54 -08:00
RelNotes-1.6.0.6.txt GIT 1.6.0.6 2008-12-19 19:27:35 -08:00
RelNotes-1.6.0.txt
RelNotes-1.6.1.txt GIT 1.6.1 2008-12-24 19:41:08 -08:00
RelNotes-1.6.2.txt Start 1.6.2 cycle 2008-12-27 14:25:10 -08:00
rev-list-options.txt Documentation: rev-list-options.txt: added --branches, --tags & --remotes. 2008-11-18 16:09:08 -08:00
SubmittingPatches Merge branch 'maint' to sync with GIT 1.6.0.6 2008-12-19 19:35:55 -08:00
urls-remotes.txt git push: Interpret $GIT_DIR/branches in a Cogito compatible way 2008-11-11 15:26:40 -08:00
urls.txt
user-manual.conf
user-manual.txt Merge branch 'maint' 2008-12-09 22:41:27 -08:00