git.ipfire.org Git - thirdparty/git.git/history

]> git.ipfire.org Git - thirdparty/git.git/history - git-mergetool.sh

projects / thirdparty / git.git / history

2008-01-21	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-01-21	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-01-21	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw
2008-01-11	Junio C Hamano	Merge ../gitk	blob \| commitdiff \| raw
2008-01-09	Junio C Hamano	Merge branch 'master' of git://git.kernel.org/pub/scm...	blob \| commitdiff \| raw
2008-01-08	Junio C Hamano	Merge in GIT 1.5.3.8	blob \| commitdiff \| raw
2008-01-08	Rogan Dawes	Allow git-mergetool to handle paths with a leading...	blob \| commitdiff \| raw
2008-01-05	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-12-31	Junio C Hamano	Merge branch 'maint' of git://linux-nfs.org/~bfields/git	blob \| commitdiff \| raw \| diff to current
2007-12-18	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-12-13	Junio C Hamano	Merge branch 'jc/shortlog-e'	blob \| commitdiff \| raw \| diff to current
2007-12-10	Junio C Hamano	Merge branch 'master' into cc/help	blob \| commitdiff \| raw \| diff to current
2007-12-09	Junio C Hamano	Merge branch 'jc/spht'	blob \| commitdiff \| raw \| diff to current
2007-12-09	Junio C Hamano	Merge branch 'pr/mergetool'	blob \| commitdiff \| raw \| diff to current
2007-12-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-12-07	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-12-07	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-12-06	Pini Reznik	Open external merge tool with original file extensions...	blob \| commitdiff \| raw \| diff to current
2007-12-06	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-12-02	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-12-02	Junio C Hamano	Merge branch 'tt/help'	blob \| commitdiff \| raw \| diff to current
2007-12-01	Junio C Hamano	Merge 1.5.3.7 in	blob \| commitdiff \| raw \| diff to current
2007-12-01	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-29	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-26	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-25	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-25	Junio C Hamano	Merge branch 'jk/send-pack'	blob \| commitdiff \| raw \| diff to current
2007-11-25	Junio C Hamano	Merge branch 'js/mingw-fallouts'	blob \| commitdiff \| raw \| diff to current
2007-11-25	Junio C Hamano	Merge branch 'mh/rebase-skip-hard'	blob \| commitdiff \| raw \| diff to current
2007-11-25	Junio C Hamano	Merge branch 'cc/bisect'	blob \| commitdiff \| raw \| diff to current
2007-11-23	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-23	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-21	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-11-21	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-19	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-19	Junio C Hamano	Merge branch 'lt/rev-list-gitlink'	blob \| commitdiff \| raw \| diff to current
2007-11-19	Junio C Hamano	Merge branch 'ds/checkout-upper'	blob \| commitdiff \| raw \| diff to current
2007-11-19	Junio C Hamano	Merge branch 'sh/p4'	blob \| commitdiff \| raw \| diff to current
2007-11-19	Junio C Hamano	Merge branch 'lt/rev-list-interactive'	blob \| commitdiff \| raw \| diff to current
2007-11-18	Junio C Hamano	Merge branch 'ph/diffopts'	blob \| commitdiff \| raw \| diff to current
2007-11-18	Junio C Hamano	Merge branch 'maint' to synchronize with 1.5.3.6	blob \| commitdiff \| raw \| diff to current
2007-11-18	Junio C Hamano	Merge branch 'ph/parseopt-sh'	blob \| commitdiff \| raw \| diff to current
2007-11-17	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-14	Junio C Hamano	Merge branch 'bs/maint-commit-options'	blob \| commitdiff \| raw \| diff to current
2007-11-14	Junio C Hamano	Merge branch 'rv/maint-index-commit'	blob \| commitdiff \| raw \| diff to current
2007-11-14	Junio C Hamano	Merge branch 'bs/maint-t7005'	blob \| commitdiff \| raw \| diff to current
2007-11-14	Junio C Hamano	Merge branch 'jc/maint-add-sync-stat'	blob \| commitdiff \| raw \| diff to current
2007-11-14	Junio C Hamano	Merge branch 'jc/stash-create'	blob \| commitdiff \| raw \| diff to current
2007-11-14	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-12	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-12	Junio C Hamano	Merge branch 'sp/maint-plug-traverse-commit-list-leak...	blob \| commitdiff \| raw \| diff to current
2007-11-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-10	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-08	Junio C Hamano	Merge branch 'jc/clean-config'	blob \| commitdiff \| raw \| diff to current
2007-11-08	Junio C Hamano	Merge branch 'ds/maint-deflatebound'	blob \| commitdiff \| raw \| diff to current
2007-11-08	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-06	Junio C Hamano	scripts: Add placeholders for OPTIONS_SPEC	blob \| commitdiff \| raw \| diff to current
2007-11-06	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-04	Junio C Hamano	Merge branch 'jc/revert-merge'	blob \| commitdiff \| raw \| diff to current
2007-11-04	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-02	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-02	Junio C Hamano	Merge branch 'ph/parseopt'	blob \| commitdiff \| raw \| diff to current
2007-11-02	Junio C Hamano	Merge branch 'np/progress'	blob \| commitdiff \| raw \| diff to current
2007-11-02	Junio C Hamano	Merge branch 'gp/maint-diffdoc'	blob \| commitdiff \| raw \| diff to current
2007-11-02	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-01	Junio C Hamano	Merge branch 'bk/maint-cvsexportcommit'	blob \| commitdiff \| raw \| diff to current
2007-11-01	Junio C Hamano	Merge branch 'js/forkexec'	blob \| commitdiff \| raw \| diff to current
2007-11-01	Junio C Hamano	Merge branch 'sp/mergetool'	blob \| commitdiff \| raw \| diff to current
2007-11-01	Junio C Hamano	Merge branch 'kh/commit'	blob \| commitdiff \| raw \| diff to current
2007-10-28	Junio C Hamano	Merge branch 'master' of git://git.kernel.org/pub/scm...	blob \| commitdiff \| raw \| diff to current
2007-10-21	Shawn O. Pearce	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2007-10-21	Shawn O. Pearce	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-10-18	Steffen Prohaska	mergetool: avoid misleading message "Resetting to defau...	blob \| commitdiff \| raw \| diff to current
2007-10-18	Steffen Prohaska	mergetool: add support for ECMerge	blob \| commitdiff \| raw \| diff to current
2007-10-18	Steffen Prohaska	mergetool: use path to mergetool in config var mergetoo...	blob \| commitdiff \| raw \| diff to current
2007-10-16	Shawn O. Pearce	Merge branch 'master' into db/fetch-pack	blob \| commitdiff \| raw \| diff to current
2007-10-03	Junio C Hamano	Merge branch 'mv/unknown'	blob \| commitdiff \| raw \| diff to current
2007-10-03	Junio C Hamano	Merge branch 'ph/strbuf'	blob \| commitdiff \| raw \| diff to current
2007-10-03	Junio C Hamano	Merge branch 'lh/merge'	blob \| commitdiff \| raw \| diff to current
2007-10-03	Junio C Hamano	Merge branch 'js/rebase-i'	blob \| commitdiff \| raw \| diff to current
2007-10-03	Junio C Hamano	Merge branch 'jc/autogc'	blob \| commitdiff \| raw \| diff to current
2007-09-29	Junio C Hamano	Merge branch 'gr/smtp'	blob \| commitdiff \| raw \| diff to current
2007-09-29	Junio C Hamano	Merge branch 'ss/svnimport'	blob \| commitdiff \| raw \| diff to current
2007-09-29	Junio C Hamano	Merge branch 'sv/svn'	blob \| commitdiff \| raw \| diff to current
2007-09-29	Junio C Hamano	Merge branch 'ml/submodule'	blob \| commitdiff \| raw \| diff to current
2007-09-29	Junio C Hamano	Merge branch 'jb/remote-rm'	blob \| commitdiff \| raw \| diff to current
2007-09-29	Junio C Hamano	Merge branch 'jk/diff-rename'	blob \| commitdiff \| raw \| diff to current
2007-09-29	Junio C Hamano	Sync with GIT 1.5.3.3	blob \| commitdiff \| raw \| diff to current
2007-09-29	Junio C Hamano	Merge branch 'mergetool' of git://repo.or.cz/git/merget...	blob \| commitdiff \| raw \| diff to current
2007-09-29	Theodore Ts'o	mergetool: Fix typo in options passed to kdiff3	blob \| commitdiff \| raw \| diff to current
2007-09-29	Theodore Ts'o	mergetool: fix emerge when running in a subdirectory	blob \| commitdiff \| raw \| diff to current
2007-09-29	Junio C Hamano	Mergetool generating blank files (1.5.3)	blob \| commitdiff \| raw \| diff to current
2007-09-26	Junio C Hamano	Merge branch 'jc/autogc' into js/rebase-i	blob \| commitdiff \| raw \| diff to current
2007-09-24	Junio C Hamano	Merge branch 'je/hooks'	blob \| commitdiff \| raw \| diff to current
2007-09-24	Junio C Hamano	Merge branch 'js/apply-build-ancestor'	blob \| commitdiff \| raw \| diff to current
2007-09-24	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-09-24	Junio C Hamano	Merge branch 'maint' of git://linux-nfs.org/~bfields...	blob \| commitdiff \| raw \| diff to current
2007-09-23	David Kastrup	Supplant the "while case ... break ;; esac" idiom	blob \| commitdiff \| raw \| diff to current
2007-09-18	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom