git.tokkee.org Git - git.git/search

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
2011-08-19	David Aguilar	difftool--helper: Make style consistent with git Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2011-06-02	David Aguilar	t/t7503-pre-commit-hook.sh: Add GIT_PREFIX tests Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2011-05-26	David Aguilar	git-mergetool--lib: Make vimdiff retain the current... Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2011-05-26	David Aguilar	git: Remove handling for GIT_PREFIX Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2011-05-26	David Aguilar	setup: Provide GIT_PREFIX to built-ins Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2010-08-18	David Aguilar	submodule sync: Update "submodule.<name>.url" Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2010-08-17	David Aguilar	mergetool: Skip autoresolved paths Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2010-07-19	David Aguilar	Documentation: Explain git-mergetool's use of temporary... Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2010-03-29	David Aguilar	Makefile: Remove usage of deprecated Python "has_key... Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2010-03-28	David Aguilar	difftool: Fix '--gui' when diff.guitool is unconfigured Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2010-01-23	David Aguilar	t7800-difftool.sh: Test mergetool.prompt fallback Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2010-01-16	David Aguilar	difftool: Update copyright notices to list each year... Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2010-01-15	David Aguilar	difftool: Use eval to expand '--extcmd' expressions Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2010-01-15	David Aguilar	difftool: Add '-x' and as an alias for '--extcmd' Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2010-01-15	David Aguilar	t7800-difftool.sh: Simplify the --extcmd test Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2010-01-10	David Aguilar	git-diff.txt: Link to git-difftool Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2010-01-10	David Aguilar	difftool: Allow specifying unconfigured commands with... Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2010-01-10	David Aguilar	difftool--helper: Remove use of the GIT_MERGE_TOOL... Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2010-01-10	David Aguilar	difftool--helper: Update copyright and remove distracting... Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2010-01-03	David Aguilar	git-difftool: Add '--gui' for selecting a GUI tool Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2010-01-03	David Aguilar	t7800-difftool: Set a bogus tool for use by tests Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2009-12-01	David Aguilar	help: Do not unnecessarily look for a repository Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2009-11-21	David Aguilar	submodule.c: Squelch a "use before assignment" warning Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2009-06-01	David Aguilar	diff: generate pretty filenames in prep_temp_blob() Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2009-06-01	David Aguilar	compat: add a basename() compatibility function Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2009-06-01	David Aguilar	compat: add a mkstemps() compatibility function Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2009-06-01	David Aguilar	Add git-replace to .gitignore Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2009-05-24	David Aguilar	mergetool--lib: add support for araxis merge Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2009-05-09	David Aguilar	mergetool--lib: specialize diff options for emerge... Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2009-04-12	David Aguilar	mergetool--lib: simplify API usage by removing more... Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2009-04-08	David Aguilar	difftool/mergetool: refactor commands to use git-mergetool... Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2009-04-08	David Aguilar	mergetool: use $( ... ) instead of `backticks` Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2009-04-08	David Aguilar	bash completion: add git-difftool Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2009-04-08	David Aguilar	difftool: add support for a difftool.prompt config... Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2009-04-08	David Aguilar	difftool: add various git-difftool tests Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2009-04-08	David Aguilar	difftool: move 'git-difftool' out of contrib Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2009-04-08	David Aguilar	difftool: add a -y shortcut for --no-prompt Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2009-04-08	David Aguilar	difftool: use perl built-ins when testing for msys Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2009-04-08	David Aguilar	difftool: remove the backup file feature Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2009-04-08	David Aguilar	difftool: remove merge options for opendiff, tkdiff... Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2009-03-22	David Aguilar	everyday: use the dashless form of git-init Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2009-03-12	David Aguilar	contrib/difftool: use a separate config namespace for... Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2009-02-01	David Aguilar	contrib/difftool: Don't repeat merge tool candidates Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2009-01-19	David Aguilar	difftool: put the cursor on the editable file for Vim Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2009-01-19	David Aguilar	difftool: fix documentation problems Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2009-01-18	David Aguilar	contrib: add 'git difftool' for launching common merge... Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2008-12-20	David Aguilar	git-mergetool: properly handle "git mergetool -- filename" Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2008-10-03	David Aguilar	tests: add a testcase for "git submodule sync" Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2008-08-26	David Aguilar	git-submodule: add "sync" command Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2008-08-23	David Aguilar	git-submodule: replace duplicated code with a module_list... Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree
2008-03-11	David Aguilar	[PATCH] gitk: Don't show local changes when we there... Signed-off-by: David Aguilar <davvid@gmail.com>	commit \| commitdiff \| tree

Git - the stupid content tracker

RSS Atom

tokkee.org

Code