?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
difftool: avoid $GIT_DIR and $GIT_WORK_TREE
2016-07-28 David Aguilardifftool: avoid $GIT_DIR and $GIT_WORK_TREE
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2016-05-16 David Aguilardifftool: handle unmerged files in dir-diff mode
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2016-05-16 David Aguilardifftool: initialize variables for readability
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2016-03-10 David Aguilarmergetool: honor tempfile configuration when resolving...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2016-03-10 David Aguilarmergetool: support delete/delete conflicts
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2015-10-29 David Aguilardifftool: ignore symbolic links in use_wt_file
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2015-07-23 David Aguilarcontrib/subtree: ignore log.date configuration
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2015-05-20 David Aguilarmergetools: add winmerge as a builtin tool
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2015-05-20 David Aguilarmergetool--lib: set IFS for difftool and mergetool
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-11-21 David Aguilarmergetools: stop setting $status in merge_cmd()
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-11-21 David Aguilarmergetool: simplify conditionals
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-11-21 David Aguilardifftool--helper: add explicit exit statement
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-11-21 David Aguilarmergetool--lib: remove use of $status global
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-11-14 David Aguilardifftool: honor --trust-exit-code for builtin tools
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-10-28 David Aguilardifftool: add support for --trust-exit-code
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-10-16 David Aguilart7610-mergetool: add test cases for mergetool.writeToTemp
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-10-16 David Aguilarmergetool: add an option for writing to a temporary...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-10-16 David Aguilarmergetool: use more conservative temporary filenames
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-10-16 David Aguilartest-lib-functions: adjust style to match CodingGuidelines
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-10-16 David Aguilart7610-mergetool: use test_config to isolate tests
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-10-16 David Aguilarmergetools/meld: make usage of `--output` configurable...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-10-15 David Aguilargit-sh-setup: move GIT_DIR initialization into a function
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-10-15 David Aguilarmergetool: use more conservative temporary filenames
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-10-15 David Aguilartest-lib-functions: adjust style to match CodingGuidelines
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-10-15 David Aguilart7610-mergetool: prefer test_config over git config
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-10-15 David Aguilart7610-mergetool: add missing && and remove commented...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-10-15 David Aguilart7610-mergetool: use tabs instead of a mix of tabs...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-10-07 David Aguilarcompletion: add --show-signature for log and show
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-09-19 David Aguilarstash: prefer --quiet over shell redirection of the...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-09-19 David Aguilarrefs: make rev-parse --quiet actually quiet
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-09-16 David Aguilart1503: use test_must_be_empty
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-09-15 David AguilarDocumentation: a note about stdout for git rev-parse...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-09-15 David Aguilarcleanups: ensure that git-compat-util.h is included...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-09-02 David Aguilarstylefix: asterisks stick to the variable, not the...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-06-27 David Aguilargitk: Catch mkdtemp errors
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-06-15 David Aguilargitk: Use mktemp -d to avoid predictable temporary...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-06-15 David Aguilargitk: Honor TMPDIR when viewing external diffs
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-02-24 David Aguilardifftool: support repositories with .git-files
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-01-16 David Aguilarpull: add --ff-only to the help text
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2014-01-16 David Aguilarpull: add pull.ff configuration
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-05-21 David Aguilarimap-send: eliminate HMAC deprecation warnings on Mac...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-05-20 David Aguilarcache.h: eliminate SHA-1 deprecation warnings on Mac...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-05-20 David AguilarMakefile: add support for Apple CommonCrypto facility
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-05-11 David AguilarMakefile: fix default regex settings on Darwin
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-05-09 David Aguilarmergetools/kdiff3: do not use --auto when diffing
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-04-16 David Aguilarhelp.c: add a compatibility comment to cmd_version()
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-25 David Aguilarcontrib/mw-to-git/t/install-wiki.sh: use a lowercase...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-25 David Aguilarcontrib/examples/git-remote.perl: use a lowercase ...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-25 David Aguilartests: use a lowercase "usage:" string
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-25 David Aguilargit-svn: use a lowercase "usage:" string
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-24 David AguilarDocumentation/user-manual.txt: use a lowercase "usage...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-24 David Aguilartemplates/hooks--update.sample: use a lowercase "usage...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-24 David Aguilarcontrib/hooks/setgitperms.perl: use a lowercase "usage...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-24 David Aguilarcontrib/examples: use a lowercase "usage:" string
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-24 David Aguilarcontrib/fast-import/import-zips.py: use spaces instead...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-24 David Aguilarcontrib/fast-import/import-zips.py: fix broken error...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-24 David Aguilarcontrib/fast-import: use a lowercase "usage:" string
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-24 David Aguilarcontrib/credential: use a lowercase "usage:" string
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-24 David Aguilargit-cvsimport: use a lowercase "usage:" string
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-24 David Aguilargit-cvsimport: use a lowercase "usage:" string
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-24 David Aguilargit-cvsexportcommit: use a lowercase "usage:" string
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-24 David Aguilargit-archimport: use a lowercase "usage:" string
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-24 David Aguilargit-merge-one-file: use a lowercase "usage:" string
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-24 David Aguilargit-relink: use a lowercase "usage:" string
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-24 David Aguilargit-svn: use a lowercase "usage:" string
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-24 David Aguilargit-sh-setup: use a lowercase "usage:" string
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-21 David Aguilart7800: "defaults" is no longer a builtin tool name
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-21 David Aguilart7800: modernize tests
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-20 David Aguilart7800: update copyright notice
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-17 David Aguilardifftool: silence uninitialized variable warning
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-10 David Aguilarp4merge: fix printf usage
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-10 David Aguilardifftool--helper: fix printf usage
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-03 David Aguilardoc: generate a list of valid merge tools
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-02-03 David Aguilarmergetool--lib: add functions for finding available...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-01-29 David Aguilarmergetool--lib: improve the help text in guess_merge_tool()
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-01-29 David Aguilarmergetool--lib: simplify command expressions
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-01-29 David Aguilarmergetools: simplify how we handle "vim" and "defaults"
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-01-28 David Aguilarmergetool--lib: improve show_tool_help() output
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2013-01-28 David Aguilarmergetools/vim: remove redundant diff command
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2012-12-27 David Aguilarmergetools/p4merge: Honor $TMPDIR for the /dev/null...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2012-10-11 David Aguilarmergetools/p4merge: Handle "/dev/null"
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2012-09-25 David Aguilarmergetool--lib: Allow custom commands to override built-ins
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2012-09-09 David Aguilargitk: Rename 'tagcontents' to 'cached_tagcontent'
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2012-09-09 David Aguilargitk: Teach "Reread references" to reload tags
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2012-08-10 David Aguilarmergetool,difftool: Document --tool-help consistently
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2012-07-26 David Aguilardifftool: Disable --symlinks on cygwin
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2012-07-26 David Aguilardifftool: Handle compare() returning -1
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2012-07-26 David Aguilardifftool: Wrap long lines for readability
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2012-07-25 David Aguilardifftool: Check all return codes from compare()
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2012-07-25 David Aguilardifftool: Handle finding mergetools/ in a path with...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2012-07-23 David Aguilardifftool: Use symlinks when diffing against the worktree
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2012-07-23 David Aguilardifftool: Call the temp directory "git-difftool"
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2012-07-23 David Aguilardifftool: Move option values into a hash
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2012-07-23 David Aguilardifftool: Eliminate global variables
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2012-07-23 David Aguilardifftool: Simplify print_tool_help()
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2012-03-19 David Aguilart7800: Test difftool passing arguments to diff
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2012-01-23 David Aguilarmergetool: Provide an empty file when needed
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2011-08-30 David AguilarMakefile: Improve compiler header dependency check
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2011-08-19 David Aguilarmergetools/meld: Use '--output' when available
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2011-08-19 David Aguilarmergetool--lib: Refactor tools into separate files
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
next
Alternate source for your git.git needs