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-06-07	Junio C Hamano	Merge 1.5.5.4 in	blob \| commitdiff \| raw
2008-06-06	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2008-06-04	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2008-05-28	Junio C Hamano	Merge 1.5.5.3 in	blob \| commitdiff \| raw
2008-05-27	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2008-05-27	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-05-26	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2008-05-26	Junio C Hamano	Merge branch 'maint-1.5.4' into maint	blob \| commitdiff \| raw \| diff to current
2008-05-25	Junio C Hamano	Merge branch 'db/clone-in-c'	blob \| commitdiff \| raw
2008-05-25	Junio C Hamano	Merge branch 'ar/batch-cat'	blob \| commitdiff \| raw
2008-05-25	Junio C Hamano	Merge branch 'ap/svn'	blob \| commitdiff \| raw
2008-05-24	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw
2008-05-23	Junio C Hamano	Merge branch 'pb/push'	blob \| commitdiff \| raw
2008-05-23	Junio C Hamano	Merge branch 'bc/repack'	blob \| commitdiff \| raw
2008-05-23	Junio C Hamano	Merge branch 'sp/ignorecase'	blob \| commitdiff \| raw
2008-05-23	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2008-05-23	Junio C Hamano	Merge branch 'maint-1.5.4' into maint v1.5.5.2	blob \| commitdiff \| raw \| diff to current
2008-05-21	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2008-05-21	Junio C Hamano	Merge branch 'maint-1.5.4' into maint	blob \| commitdiff \| raw \| diff to current
2008-05-21	Junio C Hamano	Merge branch 'ds/branch-auto-rebase'	blob \| commitdiff \| raw
2008-05-21	Junio C Hamano	Merge branch 'sv/first-parent'	blob \| commitdiff \| raw
2008-05-21	Junio C Hamano	Merge branch 'np/pack'	blob \| commitdiff \| raw
2008-05-21	Junio C Hamano	Merge branch 'as/graph'	blob \| commitdiff \| raw
2008-05-21	Junio C Hamano	Merge branch 'jk/maint-send-email-compose'	blob \| commitdiff \| raw
2008-05-21	Junio C Hamano	Merge branch 'hb/maint-send-email-quote-recipients'	blob \| commitdiff \| raw
2008-05-17	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2008-05-15	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2008-05-15	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw
2008-05-14	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2008-05-14	Junio C Hamano	Merge branch 'maint-1.5.4' into maint	blob \| commitdiff \| raw \| diff to current
2008-05-14	Junio C Hamano	Merge branch 'sb/committer'	blob \| commitdiff \| raw
2008-05-14	Junio C Hamano	Merge branch 'bd/tests'	blob \| commitdiff \| raw
2008-05-14	Junio C Hamano	Merge branch 'mv/format-cc'	blob \| commitdiff \| raw
2008-05-14	Junio C Hamano	Merge branch 'cc/hooks-doc'	blob \| commitdiff \| raw
2008-05-14	Junio C Hamano	Merge branch 'jk/renamelimit' (early part)	blob \| commitdiff \| raw
2008-05-12	Junio C Hamano	Merge branch 'gp/bisect-fix'	blob \| commitdiff \| raw
2008-05-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2008-05-11	Junio C Hamano	Merge branch 'maint-1.5.4' into maint	blob \| commitdiff \| raw \| diff to current
2008-05-11	Junio C Hamano	Merge branch 'lt/core-optim'	blob \| commitdiff \| raw
2008-05-11	Sebastian Schuberth	mergetool: Make ECMerge use the settings as specified...	blob \| commitdiff \| raw
2008-05-09	Junio C Hamano	Merge branch 'maint-1.5.4' into maint	blob \| commitdiff \| raw \| diff to current
2008-05-04	Junio C Hamano	Merge branch 'maint-1.5.4' into maint	blob \| commitdiff \| raw \| diff to current
2008-04-30	Junio C Hamano	Merge branch 'maint-1.5.4' into maint	blob \| commitdiff \| raw \| diff to current
2008-04-28	Junio C Hamano	Merge branch 'maint-1.5.4' into maint	blob \| commitdiff \| raw \| diff to current
2008-04-25	Junio C Hamano	Merge branch 'maint-1.5.4' into maint	blob \| commitdiff \| raw \| diff to current
2008-04-23	Junio C Hamano	Merge branch 'maint-1.5.4' into maint	blob \| commitdiff \| raw \| diff to current
2008-04-19	Junio C Hamano	Merge branch 'maint-1.5.4' into maint	blob \| commitdiff \| raw \| diff to current
2008-04-17	Junio C Hamano	Merge branch 'maint-1.5.4' into maint	blob \| commitdiff \| raw \| diff to current
2008-04-16	Junio C Hamano	Merge branch 'maint-1.5.4' into maint	blob \| commitdiff \| raw \| diff to current
2008-04-12	Junio C Hamano	Merge branch 'maint-1.5.4' into maint	blob \| commitdiff \| raw \| diff to current
2008-04-12	Junio C Hamano	Merge branch 'maint-1.5.4' into maint	blob \| commitdiff \| raw \| diff to current
2008-04-10	Junio C Hamano	Merge branch 'maint-1.5.4' into maint	blob \| commitdiff \| raw \| diff to current
2008-04-09	Junio C Hamano	Merge branch 'jc/rename'	blob \| commitdiff \| raw \| diff to current
2008-04-09	Junio C Hamano	Merge branch 'mk/unpack-careful'	blob \| commitdiff \| raw \| diff to current
2008-04-08	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-04-07	Junio C Hamano	Merge branch 'jc/maint-apply-match-beginning'	blob \| commitdiff \| raw \| diff to current
2008-04-05	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-04-02	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-03-28	Junio C Hamano	GIT 1.5.5-rc2 v1.5.5-rc2	blob \| commitdiff \| raw \| diff to current
2008-03-27	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-03-26	Junio C Hamano	Merge branch 'jc/maint-fetch-regression-1.5.4'	blob \| commitdiff \| raw \| diff to current
2008-03-16	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-03-16	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-03-15	Junio C Hamano	Merge branch 'py/submodule'	blob \| commitdiff \| raw \| diff to current
2008-03-15	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-03-15	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-03-15	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-03-14	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-03-13	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-03-12	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-03-12	Junio C Hamano	Merge branch 'js/remote'	blob \| commitdiff \| raw \| diff to current
2008-03-12	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-03-11	Junio C Hamano	Merge branch 'jc/cherry-pick' (early part)	blob \| commitdiff \| raw \| diff to current
2008-03-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-03-09	Junio C Hamano	Merge branch 'ph/parseopt'	blob \| commitdiff \| raw \| diff to current
2008-03-09	Junio C Hamano	Merge branch 'dp/clean-fix'	blob \| commitdiff \| raw \| diff to current
2008-03-09	Junio C Hamano	Merge branch 'ml/submodule-add-existing'	blob \| commitdiff \| raw \| diff to current
2008-03-09	Junio C Hamano	Merge branch 'mr/compat-snprintf'	blob \| commitdiff \| raw \| diff to current
2008-03-09	Junio C Hamano	Merge branch 'sp/fetch-optim'	blob \| commitdiff \| raw \| diff to current
2008-03-09	Junio C Hamano	Merge branch 'jc/describe-always'	blob \| commitdiff \| raw \| diff to current
2008-03-09	Junio C Hamano	Merge branch 'jc/am'	blob \| commitdiff \| raw \| diff to current
2008-03-09	Junio C Hamano	Merge branch 'cr/reset-parseopt'	blob \| commitdiff \| raw \| diff to current
2008-03-09	Junio C Hamano	Merge branch 'jn/gitweb-pickaxe'	blob \| commitdiff \| raw \| diff to current
2008-03-09	Junio C Hamano	Merge branch 'kb/maint-filter-branch-disappear'	blob \| commitdiff \| raw \| diff to current
2008-03-09	Junio C Hamano	Merge branch 'maint' to sync with 1.5.4.4	blob \| commitdiff \| raw \| diff to current
2008-03-08	Junio C Hamano	Merge branch 'aw/maint-shortlog-blank-lines'	blob \| commitdiff \| raw \| diff to current
2008-03-08	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-03-08	Junio C Hamano	Merge branch 'js/reflog-delete'	blob \| commitdiff \| raw \| diff to current
2008-03-08	Junio C Hamano	Merge branch 'dc/format-pretty'	blob \| commitdiff \| raw \| diff to current
2008-03-08	Junio C Hamano	Merge branch 'cb/mergetool'	blob \| commitdiff \| raw \| diff to current
2008-03-06	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2008-03-05	Charles Bailey	Teach git mergetool to use custom commands defined...	blob \| commitdiff \| raw \| diff to current
2008-03-05	Charles Bailey	Changed an internal variable of mergetool to support...	blob \| commitdiff \| raw \| diff to current
2008-03-05	Charles Bailey	Tidy up git mergetool's backup file behaviour	blob \| commitdiff \| raw \| diff to current
2008-03-01	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-03-01	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2008-02-23	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2008-02-23	Junio C Hamano	Merge branch 'bc/reflog-fix' into js/reflog-delete	blob \| commitdiff \| raw \| diff to current
2008-02-17	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-02-17	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom