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

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

projects / thirdparty / git.git / history

2007-11-06	Junio C Hamano	scripts: Add placeholders for OPTIONS_SPEC	blob \| commitdiff \| raw
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
2007-08-29	Junio C Hamano	Merge branch 'master' of git://git.kernel.org/pub/scm...	blob \| commitdiff \| raw \| diff to current
2007-08-27	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-08-26	J. Bruce Fields	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-08-21	Junio C Hamano	Merge branch 'master' of git://git.kernel.org/pub/scm...	blob \| commitdiff \| raw \| diff to current
2007-08-19	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-08-19	Junio C Hamano	Merge branch 'master' of git://git.kernel.org/pub/scm...	blob \| commitdiff \| raw \| diff to current
2007-08-16	Junio C Hamano	Merge branch 'maint' to sync with 1.5.2.5	blob \| commitdiff \| raw \| diff to current
2007-08-13	Junio C Hamano	Merge branch 'master' of git://git.kernel.org/pub/scm...	blob \| commitdiff \| raw \| diff to current
2007-08-06	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-08-05	J. Bruce Fields	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-08-01	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-07-30	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-07-28	Junio C Hamano	Merge branch 'master' of git://git.kernel.org/pub/scm...	blob \| commitdiff \| raw \| diff to current
2007-07-19	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-07-14	Junio C Hamano	Merge branch 'master' of git://git.kernel.org/pub/scm...	blob \| commitdiff \| raw \| diff to current
2007-07-12	Junio C Hamano	Merge branch 'master' of git://git.kernel.org/pub/scm...	blob \| commitdiff \| raw \| diff to current
2007-07-12	Junio C Hamano	Merge commit 'git-gui/master'	blob \| commitdiff \| raw \| diff to current
2007-07-12	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-07-12	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-07-10	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-07-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-07-07	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-07-04	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-07-03	Junio C Hamano	Rewrite "git-frotz" to "git frotz"	blob \| commitdiff \| raw \| diff to current
2007-07-03	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-07-03	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-07-02	Junio C Hamano	Merge 1.5.2.3 in	blob \| commitdiff \| raw \| diff to current
2007-07-01	Junio C Hamano	Merge branch 'ml/worktree'	blob \| commitdiff \| raw \| diff to current
2007-07-01	Junio C Hamano	Merge branch 'ei/worktree+filter'	blob \| commitdiff \| raw \| diff to current
2007-06-30	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-06-29	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-06-29	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-06-29	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-06-28	Junio C Hamano	Merge branch 'master' of git://git.kernel.org/pub/scm...	blob \| commitdiff \| raw \| diff to current
2007-06-27	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-06-26	Junio C Hamano	Merge branch 'master' of git://git.kernel.org/pub/scm...	blob \| commitdiff \| raw \| diff to current
2007-06-23	Junio C Hamano	Merge branch 'js/filter'	blob \| commitdiff \| raw \| diff to current
2007-06-22	Shawn O. Pearce	Import branch 'git-p4' of git://repo.or.cz/fast-export	blob \| commitdiff \| raw \| diff to current
2007-06-16	Junio C Hamano	Merge branch 'jc/remote'	blob \| commitdiff \| raw \| diff to current
2007-06-16	Junio C Hamano	Merge branch 'gp/branch'	blob \| commitdiff \| raw \| diff to current
2007-06-16	Junio C Hamano	Merge branch 'fl/cvsserver'	blob \| commitdiff \| raw \| diff to current
2007-06-16	Junio C Hamano	Merge branch 'maint' to sync with GIT 1.5.2.2	blob \| commitdiff \| raw \| diff to current
2007-06-13	Junio C Hamano	Merge branch 'jc/blame' (early part)	blob \| commitdiff \| raw \| diff to current
2007-06-13	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-06-13	Junio C Hamano	Merge branch 'aw/cvs'	blob \| commitdiff \| raw \| diff to current
2007-06-13	Junio C Hamano	Merge branch 'ep/cvstag'	blob \| commitdiff \| raw \| diff to current
2007-06-12	Junio C Hamano	Merge branch 'lh/submodule'	blob \| commitdiff \| raw \| diff to current
2007-06-12	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-06-12	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-06-12	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-06-11	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-06-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-06-11	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-06-10	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-06-10	Theodore Ts'o	git-mergetool: Make default selection of merge-tool...	blob \| commitdiff \| raw \| diff to current
2007-06-10	Dan McGee	[PATCH] git-mergetool: Allow gvimdiff to be used as...	blob \| commitdiff \| raw \| diff to current
2007-06-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom