Public Git Hosting - git/raj.git/search

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

ramsay's fork of git

RSS Atom