Michael J Gruber 4a689afb03 difftool: provide basename to external tools ...

Currently, only configured diff helpers get the basename of the file
being compared. Tools specified with "git difftool -x" only get the
names of temporary files for the different versions.

Export BASE so that an external tool can read the name from the
environment. Rather than using a third argument, this avoids breaking
existing scripts which may somewhat carelessly be using "$@" rather than
"$1" "$2".

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2010-12-16 13:01:36 -08:00

..

howto

Merge branch 'jn/cherry-revert-message-clean-up'

2010-08-31 16:25:11 -07:00

pt_BR

…

RelNotes

Git 1.7.3.4

2010-12-15 11:47:40 -08:00

technical

document sigchain api

2010-11-16 09:50:25 -08:00

.gitattributes

…

.gitignore

…

asciidoc.conf

Merge branch 'jc/maint-doc-em-dash'

2010-09-03 09:43:42 -07:00

blame-options.txt

…

build-docdep.perl

…

cat-texi.perl

…

cmd-list.perl

…

CodingGuidelines

CodingGuidelines: mention whitespace preferences for shell scripts

2010-12-03 15:22:59 -08:00

config.txt

Merge branch 'maint-1.7.2' into maint

2010-12-01 16:40:26 -08:00

date-formats.txt

…

diff-format.txt

…

diff-generate-patch.txt

Clarify and extend the "git diff" format documentation

2010-10-19 14:15:30 -07:00

diff-options.txt

Keep together options controlling the behaviour of diffcore-rename.

2010-11-16 09:29:37 -08:00

docbook-xsl.css

…

docbook.xsl

Documentation: set a !DOCTYPE for user manual

2010-08-20 10:53:56 -07:00

everyday.txt

…

fetch-options.txt

pull: Remove --tags option from manpage

2010-11-03 15:20:33 -07:00

fix-texi.perl

…

git-add.txt

docs: give more hints about how "add -e" works

2010-11-09 16:37:40 -08:00

git-am.txt

Use parentheses and `...' where appropriate

2010-10-08 12:31:07 -07:00

git-annotate.txt

…

git-apply.txt

Use parentheses and `...' where appropriate

2010-10-08 12:31:07 -07:00

git-archimport.txt

Work around em-dash handling in newer AsciiDoc

2010-08-24 09:48:20 -07:00

git-archive.txt

Use angles for placeholders consistently

2010-10-08 12:29:52 -07:00

git-bisect-lk2009.txt

Documentation: remove stray backslashes from "Fighting regressions" article

2010-08-20 14:16:51 -07:00

git-bisect.txt

…

git-blame.txt

…

git-branch.txt

…

git-bundle.txt

Use angles for placeholders consistently

2010-10-08 12:29:52 -07:00

git-cat-file.txt

Documentation: gitrevisions is in section 7

2010-10-13 19:10:55 -07:00

git-check-attr.txt

…

git-check-ref-format.txt

Documentation: gitrevisions is in section 7

2010-10-13 19:10:55 -07:00

git-checkout-index.txt

Use parentheses and `...' where appropriate

2010-10-08 12:31:07 -07:00

git-checkout.txt

Fix missing 'does' in man-page for 'git checkout'

2010-09-27 15:08:06 -07:00

git-cherry-pick.txt

Documentation: Fix mark-up of lines with more than one tilde

2010-12-02 11:30:35 -08:00

git-cherry.txt

…

git-citool.txt

…

git-clean.txt

…

git-clone.txt

Documentation/git-clone: describe --mirror more verbosely

2010-10-06 11:24:17 -07:00

git-commit-tree.txt

Use parentheses and `...' where appropriate

2010-10-08 12:31:07 -07:00

git-commit.txt

git-commit.txt: (synopsis): move -i and -o before "--"

2010-12-01 11:26:43 -08:00

git-config.txt

…

git-count-objects.txt

…

git-cvsexportcommit.txt

…

git-cvsimport.txt

…

git-cvsserver.txt

…

git-daemon.txt

Use angles for placeholders consistently

2010-10-08 12:29:52 -07:00

git-describe.txt

…

git-diff-files.txt

…

git-diff-index.txt

…

git-diff-tree.txt

…

git-diff.txt

Documentation: update implicit "--no-index" behavior in "git diff"

2010-10-13 19:10:56 -07:00

git-difftool.txt

difftool: provide basename to external tools

2010-12-16 13:01:36 -08:00

git-fast-export.txt

Use angles for placeholders consistently

2010-10-08 12:29:52 -07:00

git-fast-import.txt

Documentation: gitrevisions is in section 7

2010-10-13 19:10:55 -07:00

git-fetch-pack.txt

…

git-fetch.txt

Use parentheses and `...' where appropriate

2010-10-08 12:31:07 -07:00

git-filter-branch.txt

Use parentheses and `...' where appropriate

2010-10-08 12:31:07 -07:00

git-fmt-merge-msg.txt

fmt-merge-msg -m to override merge title

2010-08-18 14:02:04 -07:00

git-for-each-ref.txt

Use parentheses and `...' where appropriate

2010-10-08 12:31:07 -07:00

git-format-patch.txt

Documentation: gitrevisions is in section 7

2010-10-13 19:10:55 -07:00

git-fsck-objects.txt

…

git-fsck.txt

…

git-gc.txt

…

git-get-tar-commit-id.txt

…

git-grep.txt

Documentation: add missing quotes to "git grep" examples

2010-08-20 14:16:21 -07:00

git-gui.txt

…

git-hash-object.txt

…

git-help.txt

Work around em-dash handling in newer AsciiDoc

2010-08-24 09:48:20 -07:00

git-http-backend.txt

…

git-http-fetch.txt

…

git-http-push.txt

…

git-imap-send.txt

…

git-index-pack.txt

Use angles for placeholders consistently

2010-10-08 12:29:52 -07:00

git-init-db.txt

…

git-init.txt

Use parentheses and `...' where appropriate

2010-10-08 12:31:07 -07:00

git-instaweb.txt

Merge branch 'jc/maint-doc-em-dash'

2010-09-03 09:43:42 -07:00

git-log.txt

Documentation: gitrevisions is in section 7

2010-10-13 19:10:55 -07:00

git-lost-found.txt

…

git-ls-files.txt

Use parentheses and `...' where appropriate

2010-10-08 12:31:07 -07:00

git-ls-remote.txt

…

git-ls-tree.txt

Use angles for placeholders consistently

2010-10-08 12:29:52 -07:00

git-mailinfo.txt

…

git-mailsplit.txt

Use parentheses and `...' where appropriate

2010-10-08 12:31:07 -07:00

git-merge-base.txt

merge-base --independent to print reduced parent list in a merge

2010-08-18 14:02:03 -07:00

git-merge-file.txt

…

git-merge-index.txt

Documentation: remove backslashes in manpage synopses

2010-08-20 14:16:22 -07:00

git-merge-one-file.txt

…

git-merge-tree.txt

…

git-merge.txt

Fix a formatting error in git-merge.txt

2010-10-29 10:16:35 -07:00

git-mergetool--lib.txt

Work around em-dash handling in newer AsciiDoc

2010-08-24 09:48:20 -07:00

git-mergetool.txt

Use parentheses and `...' where appropriate

2010-10-08 12:31:07 -07:00

git-mktag.txt

…

git-mktree.txt

…

git-mv.txt

…

git-name-rev.txt

…

git-notes.txt

notes: allow --dry-run for -n and --verbose for -v

2010-08-09 10:12:50 -07:00

git-pack-objects.txt

Use parentheses and `...' where appropriate

2010-10-08 12:31:07 -07: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

prune: allow --dry-run for -n and --verbose for -v

2010-08-09 10:13:18 -07:00

git-pull.txt

Merge branch 'ja/maint-pull-rebase-doc' into maint

2010-12-14 07:36:23 -08:00

git-push.txt

Documentation: gitrevisions is in section 7

2010-10-13 19:10:55 -07:00

git-quiltimport.txt

…

git-read-tree.txt

git-read-tree.txt: acknowledge the directory matching bug in sparse checkout

2010-07-25 23:14:18 -07:00

git-rebase.txt

Merge branch 'jn/doc-backslash'

2010-09-03 09:43:42 -07:00

git-receive-pack.txt

…

git-reflog.txt

Documentation: gitrevisions is in section 7

2010-10-13 19:10:55 -07:00

git-relink.txt

Use parentheses and `...' where appropriate

2010-10-08 12:31:07 -07:00

git-remote-helpers.txt

…

git-remote.txt

Use parentheses and `...' where appropriate

2010-10-08 12:31:07 -07:00

git-repack.txt

Merge branch 'jk/repack-reuse-object' into maint

2010-11-24 12:45:07 -08:00

git-replace.txt

…

git-repo-config.txt

…

git-request-pull.txt

…

git-rerere.txt

…

git-reset.txt

git-reset.txt: make modes description more consistent

2010-09-18 15:14:41 -07:00

git-rev-list.txt

Use parentheses and `...' where appropriate

2010-10-08 12:31:07 -07:00

git-rev-parse.txt

Use parentheses and `...' where appropriate

2010-10-08 12:31:07 -07:00

git-revert.txt

Documentation: Fix mark-up of lines with more than one tilde

2010-12-02 11:30:35 -08:00

git-rm.txt

git-rm.txt: Fix quoting

2010-12-07 13:13:21 -08:00

git-send-email.txt

Add --force to git-send-email documentation

2010-12-10 10:50:32 -08:00

git-send-pack.txt

…

git-sh-setup.txt

…

git-shell.txt

…

git-shortlog.txt

Remove stray quotes in --pretty and --format documentation

2010-10-08 12:31:07 -07:00

git-show-branch.txt

Merge branch 'sn/doc-opt-notation' into maint

2010-10-21 16:26:42 -07:00

git-show-index.txt

…

git-show-ref.txt

git-show-ref.txt: clarify the pattern matching

2010-10-19 14:15:30 -07:00

git-show.txt

Documentation: document show -s

2010-11-09 09:42:57 -08:00

git-stage.txt

…

git-stash.txt

detached-stash: update Documentation

2010-08-21 23:51:22 -07:00

git-status.txt

Submodules: Use "ignore" settings from .gitmodules too for diff and status

2010-08-09 09:11:44 -07:00

git-stripspace.txt

…

git-submodule.txt

…

git-svn.txt

Use parentheses and `...' where appropriate

2010-10-08 12:31:07 -07:00

git-symbolic-ref.txt

…

git-tag.txt

…

git-tar-tree.txt

…

git-tools.txt

…

git-unpack-file.txt

…

git-unpack-objects.txt

…

git-update-index.txt

Merge branch 'sn/doc-opt-notation' into maint

2010-10-21 16:26:42 -07: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-web--browse.txt

Use angles for placeholders consistently

2010-10-08 12:29:52 -07:00

git-whatchanged.txt

…

git-write-tree.txt

…

git.txt

Git 1.7.3.2

2010-10-21 17:14:32 -07:00

gitattributes.txt

userdiff.c: add builtin fortran regex patterns

2010-09-10 09:38:29 -07:00

gitcli.txt

…

gitcore-tutorial.txt

Documentation: gitrevisions is in section 7

2010-10-13 19:10:55 -07:00

gitcvs-migration.txt

…

gitdiffcore.txt

…

gitglossary.txt

…

githooks.txt

…

gitignore.txt

Documentation: point to related commands from gitignore

2010-11-11 10:57:16 -08:00

gitk.txt

Documentation: gitrevisions is in section 7

2010-10-13 19:10:55 -07:00

gitmodules.txt

Typos in code comments, an error message, documentation

2010-08-22 13:26:13 -07:00

gitrepository-layout.txt

…

gitrevisions.txt

…

gittutorial-2.txt

…

gittutorial.txt

…

gitworkflows.txt

…

glossary-content.txt

…

howto-index.sh

…

i18n.txt

…

install-doc-quick.sh

…

install-webdoc.sh

install-webdoc: keep installed RelNotes-*.txt

2010-09-09 16:17:59 -07:00

mailmap.txt

…

Makefile

docs: fix Makefile dependency for user manual

2010-08-21 21:53:16 -07:00

manpage-1.72.xsl

…

manpage-base-url.xsl.in

…

manpage-base.xsl

…

manpage-bold-literal.xsl

…

manpage-normal.xsl

…

manpage-quote-apos.xsl

…

manpage-suppress-sp.xsl

…

merge-config.txt

…

merge-options.txt

…

merge-strategies.txt

Use angles for placeholders consistently

2010-10-08 12:29:52 -07:00

pretty-formats.txt

…

pretty-options.txt

Remove stray quotes in --pretty and --format documentation

2010-10-08 12:31:07 -07:00

pull-fetch-param.txt

…

rev-list-options.txt

Document that rev-list --graph triggers parent rewriting.

2010-11-17 13:16:48 -08:00

revisions.txt

update comment and documentation for :/foo syntax

2010-09-27 10:54:52 -07:00

SubmittingPatches

SubmittingPatches: Document some extra tags used in commit messages

2010-10-06 13:45:42 -07:00

urls-remotes.txt

…

urls.txt

…

user-manual.conf

…

user-manual.txt

Merge branch 'sn/doc-opt-notation' into maint

2010-10-21 16:26:42 -07:00