git.oblomov.eu Git - git/history - t/t7800-difftool.sh

2010-01-28	Junio C Hamano	Merge branch 'gp/maint-cvsserver'	blob \| commitdiff \| raw
2010-01-27	Junio C Hamano	Merge branch 'jc/maint-reflog-bad-timestamp'	blob \| commitdiff \| raw
2010-01-27	Junio C Hamano	Merge branch 'il/maint-colon-address'	blob \| commitdiff \| raw
2010-01-27	Junio C Hamano	Merge branch 'il/maint-xmallocz'	blob \| commitdiff \| raw
2010-01-27	Junio C Hamano	Merge branch 'jh/maint-config-file-prefix'	blob \| commitdiff \| raw
2010-01-25	Junio C Hamano	Merge branch 'jc/fix-tree-walk'	blob \| commitdiff \| raw
2010-01-24	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2010-01-24	Junio C Hamano	Merge branch 'maint' of git://git.spearce.org/git-gui...	blob \| commitdiff \| raw \| diff to current
2010-01-24	Junio C Hamano	Merge branch 'doc-style/for-next' of git://repo.or...	blob \| commitdiff \| raw
2010-01-23	Junio C Hamano	Merge git://git.bogomips.org/git-svn	blob \| commitdiff \| raw
2010-01-23	David Aguilar	t7800-difftool.sh: Test mergetool.prompt fallback	blob \| commitdiff \| raw
2010-01-23	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2010-01-23	Junio C Hamano	Merge branch 'jc/branch-d'	blob \| commitdiff \| raw \| diff to current
2010-01-23	Junio C Hamano	Merge branch 'il/rev-glob'	blob \| commitdiff \| raw \| diff to current
2010-01-23	Junio C Hamano	Merge branch 'js/refer-upstream'	blob \| commitdiff \| raw \| diff to current
2010-01-23	Junio C Hamano	Merge branch 'jl/submodule-diff'	blob \| commitdiff \| raw \| diff to current
2010-01-23	Junio C Hamano	Merge branch 'il/remote-updates'	blob \| commitdiff \| raw \| diff to current
2010-01-23	Junio C Hamano	Merge branch 'il/branch-set-upstream'	blob \| commitdiff \| raw \| diff to current
2010-01-23	Junio C Hamano	Merge branch 'jc/maint-limit-note-output'	blob \| commitdiff \| raw \| diff to current
2010-01-22	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2010-01-21	Junio C Hamano	Merge branch 'bw/cvsimport'	blob \| commitdiff \| raw \| diff to current
2010-01-21	Junio C Hamano	Merge branch 'jc/checkout-merge-base'	blob \| commitdiff \| raw \| diff to current
2010-01-21	Junio C Hamano	Merge branch 'ag/patch-header-verify'	blob \| commitdiff \| raw \| diff to current
2010-01-21	Junio C Hamano	Merge branch 'jc/conflict-marker-size'	blob \| commitdiff \| raw \| diff to current
2010-01-21	Junio C Hamano	Merge branch 'ag/maint-apply-too-large-p'	blob \| commitdiff \| raw \| diff to current
2010-01-21	Junio C Hamano	Merge branch 'ap/merge-backend-opts'	blob \| commitdiff \| raw \| diff to current
2010-01-21	Junio C Hamano	Merge branch 'nd/status-partial-refresh'	blob \| commitdiff \| raw \| diff to current
2010-01-21	Junio C Hamano	Merge remote branch 'remotes/trast-doc/for-next'	blob \| commitdiff \| raw \| diff to current
2010-01-21	Junio C Hamano	Merge branch 'jh/notes' (early part)	blob \| commitdiff \| raw \| diff to current
2010-01-21	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2010-01-20	Junio C Hamano	Merge branch 'rr/core-tutorial'	blob \| commitdiff \| raw \| diff to current
2010-01-20	Junio C Hamano	Merge branch 'jc/cache-unmerge'	blob \| commitdiff \| raw \| diff to current
2010-01-20	Junio C Hamano	Merge branch 'js/exec-error-report'	blob \| commitdiff \| raw \| diff to current
2010-01-20	Junio C Hamano	Merge branch 'jc/ls-files-ignored-pathspec'	blob \| commitdiff \| raw \| diff to current
2010-01-20	Junio C Hamano	Merge branch 'jc/grep-lookahead'	blob \| commitdiff \| raw \| diff to current
2010-01-20	Junio C Hamano	Merge branch 'jc/maint-strbuf-add-fix-doubling'	blob \| commitdiff \| raw \| diff to current
2010-01-20	Junio C Hamano	Merge branch 'mm/conflict-advice'	blob \| commitdiff \| raw \| diff to current
2010-01-20	Junio C Hamano	Merge branch 'da/difftool'	blob \| commitdiff \| raw \| diff to current
2010-01-20	Junio C Hamano	Merge branch 'bg/maint-remote-update-default' into...	blob \| commitdiff \| raw \| diff to current
2010-01-19	Junio C Hamano	Merge branch 'maint-1.6.4' into maint-1.6.5	blob \| commitdiff \| raw \| diff to current
2010-01-19	Junio C Hamano	Merge branch 'maint-1.6.2' into maint-1.6.3	blob \| commitdiff \| raw \| diff to current
2010-01-17	Junio C Hamano	Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'	blob \| commitdiff \| raw \| diff to current
2010-01-16	David Aguilar	difftool: Update copyright notices to list each year...	blob \| commitdiff \| raw \| diff to current
2010-01-15	David Aguilar	difftool: Use eval to expand '--extcmd' expressions	blob \| commitdiff \| raw \| diff to current
2010-01-15	David Aguilar	difftool: Add '-x' and as an alias for '--extcmd'	blob \| commitdiff \| raw \| diff to current
2010-01-15	David Aguilar	t7800-difftool.sh: Simplify the --extcmd test	blob \| commitdiff \| raw \| diff to current
2010-01-13	Junio C Hamano	Merge branch 'jc/checkout-merge-base'	blob \| commitdiff \| raw \| diff to current
2010-01-13	Junio C Hamano	Merge branch 'nd/sparse'	blob \| commitdiff \| raw \| diff to current
2010-01-12	Junio C Hamano	Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc...	blob \| commitdiff \| raw \| diff to current
2010-01-10	Junio C Hamano	Merge branch 'bg/maint-remote-update-default'	blob \| commitdiff \| raw \| diff to current
2010-01-10	Junio C Hamano	Merge branch 'maint-1.6.2' into maint	blob \| commitdiff \| raw \| diff to current
2010-01-10	David Aguilar	difftool: Allow specifying unconfigured commands with...	blob \| commitdiff \| raw \| diff to current
2010-01-10	David Aguilar	difftool--helper: Remove use of the GIT_MERGE_TOOL...	blob \| commitdiff \| raw \| diff to current
2010-01-03	David Aguilar	git-difftool: Add '--gui' for selecting a GUI tool	blob \| commitdiff \| raw \| diff to current
2010-01-03	David Aguilar	t7800-difftool: Set a bogus tool for use by tests	blob \| commitdiff \| raw \| diff to current
2009-12-31	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw \| diff to current
2009-12-30	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw \| diff to current
2009-12-28	Junio C Hamano	Merge branch 'jk/1.7.0-status'	blob \| commitdiff \| raw \| diff to current
2009-12-27	Junio C Hamano	Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...	blob \| commitdiff \| raw \| diff to current
2009-12-26	Junio C Hamano	Merge branch 'jc/1.7.0-diff-whitespace-only-status'	blob \| commitdiff \| raw \| diff to current
2009-12-26	Junio C Hamano	Merge branch 'jc/1.7.0-push-safety'	blob \| commitdiff \| raw \| diff to current
2009-12-26	Junio C Hamano	Merge branch 'jc/1.7.0-send-email-no-thread-default'	blob \| commitdiff \| raw \| diff to current
2009-12-09	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2009-12-09	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2009-12-09	Junio C Hamano	Merge branch 'mm/maint-merge-ff-error-message-fix'...	blob \| commitdiff \| raw \| diff to current
2009-12-09	Junio C Hamano	Merge branch 'jk/maint-add-p-delete-fix' into maint	blob \| commitdiff \| raw \| diff to current
2009-12-03	Junio C Hamano	Merge branch 'uk/maint-shortlog-encoding' into maint	blob \| commitdiff \| raw \| diff to current
2009-12-03	Junio C Hamano	Merge branch 'fc/maint-format-patch-pathspec-dashes...	blob \| commitdiff \| raw \| diff to current
2009-12-03	Junio C Hamano	Merge branch 'ap/maint-merge-strategy-list-fix' into...	blob \| commitdiff \| raw \| diff to current
2009-12-03	Junio C Hamano	Merge branch 'jc/maint-am-keep' into maint	blob \| commitdiff \| raw \| diff to current
2009-12-03	Junio C Hamano	Merge branch 'rs/work-around-grep-opt-insanity' into...	blob \| commitdiff \| raw \| diff to current
2009-12-03	Junio C Hamano	Merge branch 'rj/maint-cygwin-count-objects' into maint	blob \| commitdiff \| raw \| diff to current
2009-12-03	Junio C Hamano	Merge branch 'mm/maint-hint-failed-merge' into maint	blob \| commitdiff \| raw \| diff to current
2009-12-03	Junio C Hamano	Merge branch 'th/maint-remote-update-help-string' into...	blob \| commitdiff \| raw \| diff to current
2009-12-03	Junio C Hamano	Merge branch 'rj/maint-t9700' into maint	blob \| commitdiff \| raw \| diff to current
2009-12-03	Junio C Hamano	Merge branch 'ls/maint-mailinfo-no-inbody' into maint	blob \| commitdiff \| raw \| diff to current
2009-12-03	Junio C Hamano	Merge branch 'mo/maint-crlf-doc' into maint	blob \| commitdiff \| raw \| diff to current
2009-12-03	Junio C Hamano	Merge branch 'th/remote-usage' into maint	blob \| commitdiff \| raw \| diff to current
2009-12-03	Junio C Hamano	Merge branch 'pb/maint-use-custom-perl' into maint	blob \| commitdiff \| raw \| diff to current
2009-12-03	Junio C Hamano	Merge branch 'mm/config-pathname-tilde-expand' into...	blob \| commitdiff \| raw \| diff to current
2009-12-03	Junio C Hamano	Merge branch 'bc/grep-i-F' into maint	blob \| commitdiff \| raw \| diff to current
2009-12-03	Junio C Hamano	Merge branch 'jk/maint-break-rename-reduce-memory'...	blob \| commitdiff \| raw \| diff to current
2009-12-03	Junio C Hamano	Merge branch 'rj/maint-simplify-cygwin-makefile' into...	blob \| commitdiff \| raw \| diff to current
2009-12-03	Junio C Hamano	Merge branch 'rg/doc-workflow' into maint	blob \| commitdiff \| raw \| diff to current
2009-12-03	Junio C Hamano	Merge branch 'np/maint-sideband-favor-status' into...	blob \| commitdiff \| raw \| diff to current
2009-12-01	Junio C Hamano	Merge branch 'jc/deprecate-old-syntax-from-merge'	blob \| commitdiff \| raw \| diff to current
2009-12-01	Junio C Hamano	Merge branch 'jn/gitweb-blame'	blob \| commitdiff \| raw \| diff to current
2009-11-30	Junio C Hamano	Merge branch 'fc/maint-format-patch-pathspec-dashes'	blob \| commitdiff \| raw \| diff to current
2009-11-30	Junio C Hamano	Merge branch 'mm/maint-merge-ff-error-message-fix'	blob \| commitdiff \| raw \| diff to current
2009-11-30	Junio C Hamano	Merge branch 'ap/maint-merge-strategy-list-fix'	blob \| commitdiff \| raw \| diff to current
2009-11-30	Junio C Hamano	Merge branch 'jc/pretty-lf'	blob \| commitdiff \| raw \| diff to current
2009-11-30	Junio C Hamano	Merge branch 'jc/mailinfo-remove-brackets'	blob \| commitdiff \| raw \| diff to current
2009-11-30	Junio C Hamano	Merge branch 'fc/send-email-envelope'	blob \| commitdiff \| raw \| diff to current
2009-11-30	Junio C Hamano	Merge branch 'uk/maint-shortlog-encoding'	blob \| commitdiff \| raw \| diff to current
2009-11-30	Junio C Hamano	Merge branch 'jc/maint-am-keep'	blob \| commitdiff \| raw \| diff to current
2009-11-30	Junio C Hamano	Merge remote branch 'ko/master' into HEAD	blob \| commitdiff \| raw \| diff to current
2009-11-25	Junio C Hamano	Merge branch 'rs/work-around-grep-opt-insanity'	blob \| commitdiff \| raw \| diff to current
2009-11-24	Junio C Hamano	Merge branch 'rj/maint-cygwin-count-objects'	blob \| commitdiff \| raw \| diff to current
2009-11-24	Junio C Hamano	Merge branch 'mm/maint-hint-failed-merge'	blob \| commitdiff \| raw \| diff to current
2009-11-24	Junio C Hamano	Merge branch 'mr/gitweb-snapshot'	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom