?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
detached-stash: introduce parse_flags_and_revs function
2010-07-19 David AguilarDocumentation: Explain git-mergetool's use of temporary...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2010-03-29 David AguilarMakefile: Remove usage of deprecated Python "has_key...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2010-03-28 David Aguilardifftool: Fix '--gui' when diff.guitool is unconfigured
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2010-01-23 David Aguilart7800-difftool.sh: Test mergetool.prompt fallback
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2010-01-16 David Aguilardifftool: Update copyright notices to list each year...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2010-01-15 David Aguilardifftool: Use eval to expand '--extcmd' expressions
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2010-01-15 David Aguilardifftool: Add '-x' and as an alias for '--extcmd'
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2010-01-15 David Aguilart7800-difftool.sh: Simplify the --extcmd test
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2010-01-10 David Aguilargit-diff.txt: Link to git-difftool
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2010-01-10 David Aguilardifftool: Allow specifying unconfigured commands with...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2010-01-10 David Aguilardifftool--helper: Remove use of the GIT_MERGE_TOOL...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2010-01-10 David Aguilardifftool--helper: Update copyright and remove distracting...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2010-01-03 David Aguilargit-difftool: Add '--gui' for selecting a GUI tool
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2010-01-03 David Aguilart7800-difftool: Set a bogus tool for use by tests
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2009-12-01 David Aguilarhelp: Do not unnecessarily look for a repository
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2009-11-21 David Aguilarsubmodule.c: Squelch a "use before assignment" warning
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2009-06-01 David Aguilardiff: generate pretty filenames in prep_temp_blob()
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2009-06-01 David Aguilarcompat: add a basename() compatibility function
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2009-06-01 David Aguilarcompat: add a mkstemps() compatibility function
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2009-06-01 David AguilarAdd git-replace to .gitignore
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2009-05-24 David Aguilarmergetool--lib: add support for araxis merge
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2009-05-09 David Aguilarmergetool--lib: specialize diff options for emerge...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2009-04-12 David Aguilarmergetool--lib: simplify API usage by removing more...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2009-04-08 David Aguilardifftool/mergetool: refactor commands to use git-mergetool...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2009-04-08 David Aguilarmergetool: use $( ... ) instead of `backticks`
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2009-04-08 David Aguilarbash completion: add git-difftool
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2009-04-08 David Aguilardifftool: add support for a difftool.prompt config...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2009-04-08 David Aguilardifftool: add various git-difftool tests
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2009-04-08 David Aguilardifftool: move 'git-difftool' out of contrib
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2009-04-08 David Aguilardifftool: add a -y shortcut for --no-prompt
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2009-04-08 David Aguilardifftool: use perl built-ins when testing for msys
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2009-04-08 David Aguilardifftool: remove the backup file feature
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2009-04-08 David Aguilardifftool: remove merge options for opendiff, tkdiff...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2009-03-22 David Aguilareveryday: use the dashless form of git-init
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2009-03-12 David Aguilarcontrib/difftool: use a separate config namespace for...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2009-02-01 David Aguilarcontrib/difftool: Don't repeat merge tool candidates
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2009-01-19 David Aguilardifftool: put the cursor on the editable file for Vim
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2009-01-19 David Aguilardifftool: fix documentation problems
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2009-01-18 David Aguilarcontrib: add 'git difftool' for launching common merge...
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2008-12-20 David Aguilargit-mergetool: properly handle "git mergetool -- filename"
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2008-10-03 David Aguilartests: add a testcase for "git submodule sync"
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2008-08-26 David Aguilargit-submodule: add "sync" command
Signed-off-by: David Aguilar <davvid@gmail.com>
 commit | commitdiff | tree
2008-08-23 David Aguilargit-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
Michael J Gruber's git tree