| 2014-10-15 | t7610-mergetool: prefer test_config over git config Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2014-10-15 | t7610-mergetool: add missing && and remove commented... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2014-10-15 | t7610-mergetool: use tabs instead of a mix of tabs... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2014-02-24 | difftool: support repositories with .git-files Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2014-01-16 | pull: add --ff-only to the help text Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2014-01-16 | pull: add pull.ff configuration Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-05-21 | imap-send: eliminate HMAC deprecation warnings on Mac... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-05-20 | cache.h: eliminate SHA-1 deprecation warnings on Mac... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-05-20 | Makefile: add support for Apple CommonCrypto facility Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-05-11 | Makefile: fix default regex settings on Darwin Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-05-09 | mergetools/kdiff3: do not use --auto when diffing Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-04-16 | help.c: add a compatibility comment to cmd_version() Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-25 | contrib/mw-to-git/t/install-wiki.sh: use a lowercase... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-25 | contrib/examples/git-remote.perl: use a lowercase ... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-25 | tests: use a lowercase "usage:" string Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-25 | git-svn: use a lowercase "usage:" string Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-24 | Documentation/user-manual.txt: use a lowercase "usage... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-24 | templates/hooks--update.sample: use a lowercase "usage... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-24 | contrib/hooks/setgitperms.perl: use a lowercase "usage... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-24 | contrib/examples: use a lowercase "usage:" string Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-24 | contrib/fast-import/import-zips.py: use spaces instead... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-24 | contrib/fast-import/import-zips.py: fix broken error... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-24 | contrib/fast-import: use a lowercase "usage:" string Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-24 | contrib/credential: use a lowercase "usage:" string Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-24 | git-cvsimport: use a lowercase "usage:" string Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-24 | git-cvsimport: use a lowercase "usage:" string Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-24 | git-cvsexportcommit: use a lowercase "usage:" string Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-24 | git-archimport: use a lowercase "usage:" string Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-24 | git-merge-one-file: use a lowercase "usage:" string Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-24 | git-relink: use a lowercase "usage:" string Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-24 | git-svn: use a lowercase "usage:" string Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-24 | git-sh-setup: use a lowercase "usage:" string Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-21 | t7800: "defaults" is no longer a builtin tool name Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-21 | t7800: modernize tests Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-20 | t7800: update copyright notice Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-17 | difftool: silence uninitialized variable warning Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-10 | p4merge: fix printf usage Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-10 | difftool--helper: fix printf usage Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-03 | doc: generate a list of valid merge tools Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-02-03 | mergetool--lib: add functions for finding available... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-01-29 | mergetool--lib: improve the help text in guess_merge_tool() Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-01-29 | mergetool--lib: simplify command expressions Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-01-29 | mergetools: simplify how we handle "vim" and "defaults" Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-01-28 | mergetool--lib: improve show_tool_help() output Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2013-01-28 | mergetools/vim: remove redundant diff command Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2012-12-27 | mergetools/p4merge: Honor $TMPDIR for the /dev/null... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2012-10-11 | mergetools/p4merge: Handle "/dev/null" Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2012-09-25 | mergetool--lib: Allow custom commands to override built-ins Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2012-09-09 | gitk: Rename 'tagcontents' to 'cached_tagcontent' Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2012-09-09 | gitk: Teach "Reread references" to reload tags Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2012-08-10 | mergetool,difftool: Document --tool-help consistently Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2012-07-26 | difftool: Disable --symlinks on cygwin Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2012-07-26 | difftool: Handle compare() returning -1 Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2012-07-26 | difftool: Wrap long lines for readability Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2012-07-25 | difftool: Check all return codes from compare() Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2012-07-25 | difftool: Handle finding mergetools/ in a path with... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2012-07-23 | difftool: Use symlinks when diffing against the worktree Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2012-07-23 | difftool: Call the temp directory "git-difftool" Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2012-07-23 | difftool: Move option values into a hash Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2012-07-23 | difftool: Eliminate global variables Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2012-07-23 | difftool: Simplify print_tool_help() Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2012-03-19 | t7800: Test difftool passing arguments to diff Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2012-01-23 | mergetool: Provide an empty file when needed Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2011-08-30 | Makefile: Improve compiler header dependency check Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2011-08-19 | mergetools/meld: Use '--output' when available Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2011-08-19 | mergetool--lib: Refactor tools into separate files Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2011-08-19 | mergetool--lib: Make style consistent with git Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2011-08-19 | difftool--helper: Make style consistent with git Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2011-06-02 | t/t7503-pre-commit-hook.sh: Add GIT_PREFIX tests Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2011-05-26 | git-mergetool--lib: Make vimdiff retain the current... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2011-05-26 | git: Remove handling for GIT_PREFIX Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2011-05-26 | setup: Provide GIT_PREFIX to built-ins Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2010-08-18 | submodule sync: Update "submodule.<name>.url" Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2010-08-17 | mergetool: Skip autoresolved paths Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2010-07-19 | Documentation: Explain git-mergetool's use of temporary... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2010-03-29 | Makefile: Remove usage of deprecated Python "has_key... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2010-03-28 | difftool: Fix '--gui' when diff.guitool is unconfigured Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2010-01-23 | t7800-difftool.sh: Test mergetool.prompt fallback Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2010-01-16 | difftool: Update copyright notices to list each year... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2010-01-15 | difftool: Use eval to expand '--extcmd' expressions Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2010-01-15 | difftool: Add '-x' and as an alias for '--extcmd' Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2010-01-15 | t7800-difftool.sh: Simplify the --extcmd test Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2010-01-10 | git-diff.txt: Link to git-difftool Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2010-01-10 | difftool: Allow specifying unconfigured commands with... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2010-01-10 | difftool--helper: Remove use of the GIT_MERGE_TOOL... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2010-01-10 | difftool--helper: Update copyright and remove distracting... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2010-01-03 | git-difftool: Add '--gui' for selecting a GUI tool Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2010-01-03 | t7800-difftool: Set a bogus tool for use by tests Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2009-12-01 | help: Do not unnecessarily look for a repository Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2009-11-21 | submodule.c: Squelch a "use before assignment" warning Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2009-06-01 | diff: generate pretty filenames in prep_temp_blob() Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2009-06-01 | compat: add a basename() compatibility function Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2009-06-01 | compat: add a mkstemps() compatibility function Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2009-06-01 | Add git-replace to .gitignore Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2009-05-24 | mergetool--lib: add support for araxis merge Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2009-05-09 | mergetool--lib: specialize diff options for emerge... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2009-04-12 | mergetool--lib: simplify API usage by removing more... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2009-04-08 | difftool/mergetool: refactor commands to use git-mergetool... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2009-04-08 | mergetool: use $( ... ) instead of `backticks` Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2009-04-08 | bash completion: add git-difftool Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |