summaryrefslogtreecommitdiff
path: root/builtin-revert.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-20 22:42:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-20 22:42:20 (GMT)
commitf922df8655675aafaea96f3715c9473c63d2ca47 (patch)
treedea6f313455958a524b65ea7c7fbeaf396780027 /builtin-revert.c
parent668993ff19477652d793385b4f27a62891bcd3da (diff)
parentc8a5672ea5cf593708b29f8279bd651c16047c6e (diff)
downloadgit-f922df8655675aafaea96f3715c9473c63d2ca47.zip
git-f922df8655675aafaea96f3715c9473c63d2ca47.tar.gz
git-f922df8655675aafaea96f3715c9473c63d2ca47.tar.bz2
Merge branch 'da/difftool'
* da/difftool: difftool: Update copyright notices to list each year separately difftool: Use eval to expand '--extcmd' expressions difftool: Add '-x' and as an alias for '--extcmd' t7800-difftool.sh: Simplify the --extcmd test git-diff.txt: Link to git-difftool difftool: Allow specifying unconfigured commands with --extcmd difftool--helper: Remove use of the GIT_MERGE_TOOL variable difftool--helper: Update copyright and remove distracting comments git-difftool: Add '--gui' for selecting a GUI tool t7800-difftool: Set a bogus tool for use by tests
Diffstat (limited to 'builtin-revert.c')
0 files changed, 0 insertions, 0 deletions