| 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 |
| 2009-04-08 | difftool: add support for a difftool.prompt config... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2009-04-08 | difftool: add various git-difftool tests Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2009-04-08 | difftool: move 'git-difftool' out of contrib Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2009-04-08 | difftool: add a -y shortcut for --no-prompt Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2009-04-08 | difftool: use perl built-ins when testing for msys Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2009-04-08 | difftool: remove the backup file feature Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2009-04-08 | difftool: remove merge options for opendiff, tkdiff... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2009-03-22 | everyday: use the dashless form of git-init Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2009-03-12 | contrib/difftool: use a separate config namespace for... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2009-02-01 | contrib/difftool: Don't repeat merge tool candidates Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2009-01-19 | difftool: put the cursor on the editable file for Vim Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2009-01-19 | difftool: fix documentation problems Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2009-01-18 | contrib: add 'git difftool' for launching common merge... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2008-12-20 | git-mergetool: properly handle "git mergetool -- filename" Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2008-10-03 | tests: add a testcase for "git submodule sync" Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2008-08-26 | git-submodule: add "sync" command Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2008-08-23 | git-submodule: replace duplicated code with a module_list... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |
| 2008-03-11 | [PATCH] gitk: Don't show local changes when we there... Signed-off-by: David Aguilar <davvid@gmail.com> |
diff | tree |