admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
05e934bb9f7767e13e8a658b0e429a40076a6b35
git/Documentation
History
Charles Bailey 964473a042 Teach git mergetool to use custom commands defined at config time 
Currently git mergetool is restricted to a set of commands defined
in the script. You can subvert the mergetool.<tool>.path to force
git mergetool to use a different command, but if you have a command
whose invocation syntax does not match one of the current tools then
you would have to write a wrapper script for it.

This patch adds two git config variable patterns which allow a more
flexible choice of merge tool.

If you run git mergetool with -t/--tool or the merge.tool config
variable set to an unrecognized tool then git mergetool will query the
mergetool.<tool>.cmd config variable. If this variable exists, then git
mergetool will treat the specified tool as a custom command and will use
a shell eval to run the command with the documented shell variables set.

mergetool.<tool>.trustExitCode can be used to indicate that the exit
code of the custom command can be used to determine the success of the
merge.

Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-05 12:07:04 -08:00
..
howto
Add using merge subtree How-To
2008-01-14 18:04:51 -08:00
technical
Fix doc typos.
2008-03-02 16:08:37 -08:00
.gitattributes
Define the project whitespace policy
2008-02-11 13:23:15 -08:00
.gitignore
Start preparing the API documents.
2007-12-14 22:29:38 -08:00
asciidoc.conf
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
blame-options.txt
Fix typo in 'blame' documentation.
2008-02-09 20:22:23 -08:00
build-docdep.perl
…
callouts.xsl
Revert "tweak manpage formatting"
2007-08-10 11:32:42 -07:00
cat-texi.perl
Documentation: add gitman.info target
2007-12-10 01:36:13 -08:00
cmd-list.perl
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
CodingGuidelines
CodingGuidelines: spell out how we use grep in our scripts
2008-03-01 18:18:16 -08:00
config.txt
Teach git mergetool to use custom commands defined at config time
2008-03-05 12:07:04 -08:00
core-tutorial.txt
core-tutorial typofix
2008-01-17 22:55:25 -08:00
cvs-migration.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
diff-format.txt
git-diff --numstat -z: make it machine readable
2007-12-12 10:59:22 -08:00
diff-generate-patch.txt
Include diff options in the git-log manpage
2007-12-05 01:57:40 -08:00
diff-options.txt
diff --relative: help working in a bare repository
2008-02-13 14:59:34 -08:00
diffcore.txt
War on whitespace
2007-06-07 00:04:01 -07:00
docbook-xsl.css
War on whitespace
2007-06-07 00:04:01 -07:00
docbook.xsl
Mark user-manual as UTF-8
2007-07-24 00:47:05 -07:00
everyday.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
fetch-options.txt
git pull manpage: don't include -n from fetch-options.txt
2008-01-25 22:42:36 -08:00
fix-texi.perl
Add support for an info version of the user manual
2007-08-10 23:16:18 -07:00
git-add.txt
Clarified the meaning of git-add -u in the documentation
2008-02-20 16:08:48 -08:00
git-am.txt
Documentation/git-am.txt: Pass -r in the example invocation of rm -f .dotest
2008-02-25 22:20:08 -08:00
git-annotate.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-apply.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-archimport.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-archive.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-bisect.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-blame.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-branch.txt
doc: documentation update for the branch track changes
2008-02-19 21:22:29 -08:00
git-bundle.txt
git-bundle.txt: Add different strategies to create the bundle
2008-02-24 18:51:46 -08:00
git-cat-file.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-check-attr.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-check-ref-format.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-checkout-index.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-checkout.txt
doc: documentation update for the branch track changes
2008-02-19 21:22:29 -08:00
git-cherry-pick.txt
Documentation cherry-pick: Fix cut-and-paste error
2008-02-29 21:22:22 -08:00
git-cherry.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-citool.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-clean.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-clone.txt
git clone -s documentation: force a new paragraph for the NOTE
2008-02-13 14:15:44 -08:00
git-commit-tree.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-commit.txt
git-commit: add a prepare-commit-msg hook
2008-02-06 02:26:55 -08:00
git-config.txt
fix doc typos
2008-01-29 22:00:34 -08:00
git-count-objects.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-cvsexportcommit.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-cvsimport.txt
cvsimport: document that -M can be used multiple times
2008-03-01 00:55:39 -08:00
git-cvsserver.txt
Documentation/git-cvsserver: Fix typo
2008-01-30 18:50:41 -08:00
git-daemon.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-describe.txt
Merge branch 'sb/describe-long'
2008-03-02 15:02:56 -08:00
git-diff-files.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-diff-index.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-diff-tree.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-diff.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-fast-export.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-fast-import.txt
Update fast-import documentation to discuss crash reports
2008-02-16 00:47:08 -08:00
git-fetch-pack.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-fetch.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-filter-branch.txt
filter-branch documentation: non-zero exit status in command abort the filter
2008-02-25 21:43:37 -08:00
git-fmt-merge-msg.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-for-each-ref.txt
Make for-each-ref's grab_date() support per-atom formatting
2007-09-29 20:31:59 -07:00
git-format-patch.txt
Support a --cc=<email> option in format-patch
2008-02-19 21:49:38 -08:00
git-fsck-objects.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-fsck.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-gc.txt
gc: Add --quiet option
2008-03-01 01:09:06 -08:00
git-get-tar-commit-id.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-grep.txt
Fix doc typos.
2008-03-02 16:08:37 -08:00
git-gui.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-hash-object.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-help.txt
Documentation: add 'git-web--browse.txt' and simplify other docs.
2008-02-16 00:46:33 -08:00
git-http-fetch.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-http-push.txt
Clarify that http-push being temporarily disabled with older cURL
2008-01-22 00:48:29 -08:00
git-imap-send.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-index-pack.txt
index-pack: introduce checking mode
2008-02-28 21:56:02 -08:00
git-init-db.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-init.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-instaweb.txt
Documentation: add 'git-web--browse.txt' and simplify other docs.
2008-02-16 00:46:33 -08:00
git-log.txt
Include rev-list options in git-log manpage.
2008-01-18 15:09:08 -08:00
git-lost-found.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-ls-files.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-ls-remote.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-ls-tree.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-mailinfo.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-mailsplit.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-merge-base.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-merge-file.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-merge-index.txt
git-merge-index documentation: clarify synopsis
2008-02-22 07:02:40 -08:00
git-merge-one-file.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-merge-tree.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-merge.txt
Fix incorrect wording in git-merge.txt.
2008-03-03 13:40:15 -08:00
git-mergetool.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-mktag.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-mktree.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-mv.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-name-rev.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-pack-objects.txt
pack-objects: Add runtime detection of online CPU's
2008-02-23 12:00:32 -08:00
git-pack-redundant.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-pack-refs.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-parse-remote.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-patch-id.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-peek-remote.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-prune-packed.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-prune.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-pull.txt
Correct git-pull documentation
2008-02-19 21:31:33 -08:00
git-push.txt
push: document the status output
2008-02-19 20:46:15 -08:00
git-quiltimport.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-read-tree.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-rebase.txt
Documentation/git-rebase.txt: Add --strategy to synopsys
2008-03-01 19:45:15 -08:00
git-receive-pack.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-reflog.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-relink.txt
git-relink.txt: describe more clearly how hard linking occurs
2008-01-11 18:06:55 -08:00
git-remote.txt
git-remote documentation: fix synopsis to match description
2008-02-03 16:02:12 -08:00
git-repack.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-repo-config.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-request-pull.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-rerere.txt
Fix git-rerere documentation
2008-01-14 16:14:29 -08:00
git-reset.txt
Documentation/git-reset: Add an example of resetting selected paths
2008-02-16 10:57:05 -08:00
git-rev-list.txt
rev-list: add --branches, --tags and --remotes
2008-02-29 00:00:29 -08:00
git-rev-parse.txt
git rev-parse manpage: spelling fix
2008-01-31 13:59:00 -08:00
git-revert.txt
doc typo: s/prior committing/prior to committing/
2008-01-19 11:25:37 -08:00
git-rm.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-send-email.txt
Merge branch 'mw/send-email'
2008-02-11 16:46:36 -08:00
git-send-pack.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-sh-setup.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-shell.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-shortlog.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-show-branch.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-show-index.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-show-ref.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-show.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-stash.txt
Documentation/git-stash: document options for git stash list
2008-02-20 11:23:58 -08:00
git-status.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-stripspace.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-submodule.txt
submodule: Document the details of the command line syntax
2008-01-21 00:57:51 -08:00
git-svn.txt
Merge branch 'maint'
2008-02-27 14:07:51 -08:00
git-symbolic-ref.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-tag.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-tar-tree.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-tools.txt
Remove outdated references to cogito in documentation
2007-10-29 12:53:50 -07:00
git-unpack-file.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-unpack-objects.txt
Revert "unpack-objects: prevent writing of inconsistent objects"
2008-03-04 03:11:30 -08:00
git-update-index.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-update-ref.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-update-server-info.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-upload-archive.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-upload-pack.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-var.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-verify-pack.txt
add storage size output to 'git verify-pack -v'
2008-03-01 01:44:46 -08:00
git-verify-tag.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-web--browse.txt
Documentation: add 'git-web--browse.txt' and simplify other docs.
2008-02-16 00:46:33 -08:00
git-whatchanged.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git-write-tree.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
git.txt
Sync with 1.5.4.3
2008-02-23 11:49:34 -08:00
gitattributes.txt
safecrlf: Add mechanism to warn about irreversible crlf conversions
2008-02-06 13:07:28 -08:00
gitcli.txt
Documentation: typofix
2008-01-07 14:02:00 -08:00
gitignore.txt
gitignore(5): Allow "foo/" in ignore list to match directory "foo"
2008-02-05 00:46:49 -08:00
gitk.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
gitmodules.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
glossary.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
hooks.txt
git-commit: add a prepare-commit-msg hook
2008-02-06 02:26:55 -08:00
howto-index.sh
…
i18n.txt
Fix grammar nits in documentation and in code comments.
2008-01-03 09:15:17 -08:00
install-doc-quick.sh
Fix "make GZ=1 quick-install-doc"
2007-08-06 21:16:21 -07:00
install-webdoc.sh
Start preparing the API documents.
2007-12-14 22:29:38 -08:00
Makefile
man pages are littered with .ft C and others
2008-02-11 12:51:55 -08:00
manpage-1.72.xsl
man pages are littered with .ft C and others
2008-02-11 12:51:55 -08:00
merge-options.txt
git-merge: add --ff and --no-ff options
2007-09-23 17:14:03 -07:00
merge-strategies.txt
…
pretty-formats.txt
Support output ISO 8601 format dates
2007-07-13 22:47:49 -07:00
pretty-options.txt
pretty-options.txt: tiny doc fix
2007-07-25 00:06:38 -07:00
pull-fetch-param.txt
War on whitespace
2007-06-07 00:04:01 -07:00
RelNotes-1.5.0.1.txt
…
RelNotes-1.5.0.2.txt
…
RelNotes-1.5.0.3.txt
…
RelNotes-1.5.0.4.txt
War on whitespace
2007-06-07 00:04:01 -07:00
RelNotes-1.5.0.5.txt
War on whitespace
2007-06-07 00:04:01 -07:00
RelNotes-1.5.0.6.txt
War on whitespace
2007-06-07 00:04:01 -07:00
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
War on whitespace
2007-06-07 00:04:01 -07:00
RelNotes-1.5.1.4.txt
GIT v1.5.1.4
2007-05-08 22:11:17 -07:00
RelNotes-1.5.1.5.txt
GIT 1.5.1.6
2007-05-20 00:15:53 -07:00
RelNotes-1.5.1.6.txt
GIT 1.5.1.6
2007-05-20 00:15:53 -07:00
RelNotes-1.5.1.txt
…
RelNotes-1.5.2.1.txt
GIT 1.5.2.1
2007-06-02 16:02:49 -07:00
RelNotes-1.5.2.2.txt
GIT 1.5.2.2
2007-06-16 01:13:35 -07:00
RelNotes-1.5.2.3.txt
GIT 1.5.2.3
2007-07-02 00:35:58 -07:00
RelNotes-1.5.2.4.txt
GIT 1.5.2.4
2007-07-12 12:01:47 -07:00
RelNotes-1.5.2.5.txt
GIT 1.5.2.5
2007-08-15 15:01:20 -07:00
RelNotes-1.5.2.txt
GIT 1.5.2
2007-05-20 00:30:39 -07:00
RelNotes-1.5.3.1.txt
GIT 1.5.3.1: obsolete git-p4 in RPM spec file.
2007-09-03 01:28:37 -07:00
RelNotes-1.5.3.2.txt
GIT 1.5.3.2
2007-09-19 03:11:28 -07:00
RelNotes-1.5.3.3.txt
fix doc typos
2008-01-29 22:00:34 -08:00
RelNotes-1.5.3.4.txt
GIT 1.5.3.4
2007-10-03 02:33:48 -07:00
RelNotes-1.5.3.5.txt
RelNotes-1.5.3.5: fix another typo
2007-11-07 11:37:15 -08:00
RelNotes-1.5.3.6.txt
GIT 1.5.3.6
2007-11-18 14:00:38 -08:00
RelNotes-1.5.3.7.txt
GIT 1.5.3.7
2007-12-01 11:20:00 -08:00
RelNotes-1.5.3.8.txt
GIT 1.5.3.8
2008-01-07 22:41:43 -08:00
RelNotes-1.5.3.txt
Typofix: 1.5.3 release notes
2007-09-02 15:03:26 -07:00
RelNotes-1.5.4.1.txt
GIT 1.5.4.2
2008-02-17 00:20:38 -08:00
RelNotes-1.5.4.2.txt
GIT 1.5.4.2
2008-02-17 00:20:38 -08:00
RelNotes-1.5.4.3.txt
GIT 1.5.4.3
2008-02-23 11:31:04 -08:00
RelNotes-1.5.4.4.txt
Update draft release notes for 1.5.4.4
2008-03-02 23:37:54 -08:00
RelNotes-1.5.4.txt
GIT 1.5.4
2008-02-01 19:10:10 -08:00
RelNotes-1.5.5.txt
Update draft release notes for 1.5.5
2008-03-03 00:05:38 -08:00
repository-layout.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
rev-list-options.txt
Documentation: Remove --{min,max}-age option from git-log(1)
2008-03-02 13:52:08 -08:00
SubmittingPatches
Documentation/SubmittingPatches - a suggested patch flow
2008-02-16 17:33:31 -08:00
tutorial-2.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
tutorial.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
urls-remotes.txt
Add urls.txt to git-clone man page
2007-07-05 21:43:48 -07:00
urls.txt
Add support for url aliases in config files
2008-02-24 20:05:29 -08:00
user-manual.conf
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00
user-manual.txt
Documentation: rename gitlink macro to linkgit
2008-01-06 18:41:44 -08:00