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

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

projects / thirdparty / git.git / history

2009-05-18	Junio C Hamano	Merge branch 'js/add-edit'	blob \| commitdiff \| raw
2009-05-16	Junio C Hamano	Merge branch 'maint-1.6.2' into maint	blob \| commitdiff \| raw
2009-05-14	Junio C Hamano	Merge branch 'maint-1.6.1' into maint-1.6.2	blob \| commitdiff \| raw \| diff to current
2009-05-12	Junio C Hamano	Merge branch 'maint-1.6.2' into maint	blob \| commitdiff \| raw
2009-05-09	Junio C Hamano	Merge branch 'maint-1.6.1' into maint-1.6.2	blob \| commitdiff \| raw \| diff to current
2009-05-06	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-05-06	Junio C Hamano	Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maint	blob \| commitdiff \| raw \| diff to current
2009-05-06	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw \| diff to current
2009-05-03	Junio C Hamano	Sync with GIT 1.6.2.5	blob \| commitdiff \| raw
2009-05-03	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw \| diff to current
2009-05-03	Junio C Hamano	Merge branch 'lt/pack-object-memuse' into maint	blob \| commitdiff \| raw \| diff to current
2009-05-03	Junio C Hamano	Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...	blob \| commitdiff \| raw \| diff to current
2009-05-02	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2009-05-01	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw
2009-04-29	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-04-29	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw \| diff to current
2009-04-28	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-04-28	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw \| diff to current
2009-04-25	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-04-25	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw \| diff to current
2009-04-23	Junio C Hamano	Merge branch 'jc/maint-read-tree-multi'	blob \| commitdiff \| raw
2009-04-21	Junio C Hamano	Merge branch 'mk/maint-apply-swap'	blob \| commitdiff \| raw
2009-04-21	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-04-20	Junio C Hamano	Merge branch 'mm/maint-add-p-quit'	blob \| commitdiff \| raw
2009-04-20	Junio C Hamano	Sync with 1.6.2.4	blob \| commitdiff \| raw
2009-04-18	Junio C Hamano	Merge branch 'lt/bool-on-off'	blob \| commitdiff \| raw
2009-04-18	Junio C Hamano	Merge branch 'lt/pack-object-memuse'	blob \| commitdiff \| raw
2009-04-18	Junio C Hamano	Merge branch 'nd/archive-attribute'	blob \| commitdiff \| raw
2009-04-18	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-04-18	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw \| diff to current
2009-04-18	Junio C Hamano	Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into...	blob \| commitdiff \| raw \| diff to current
2009-04-18	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw \| diff to current
2009-04-18	Junio C Hamano	Merge branch 'ac/color-graph'	blob \| commitdiff \| raw
2009-04-18	Junio C Hamano	Merge branch 'jk/cobdoc'	blob \| commitdiff \| raw
2009-04-18	Junio C Hamano	Merge branch 'mk/apply-swap'	blob \| commitdiff \| raw
2009-04-18	Junio C Hamano	Merge branch 'mm/add-p-quit'	blob \| commitdiff \| raw
2009-04-18	Junio C Hamano	Merge branch 'eb/upload-archive-from-git-shell'	blob \| commitdiff \| raw
2009-04-18	Junio C Hamano	Merge branch 'jc/shared-literally'	blob \| commitdiff \| raw
2009-04-18	Junio C Hamano	Merge branch 'ns/am-to-empty'	blob \| commitdiff \| raw
2009-04-18	Junio C Hamano	Merge branch 'bw/short-ref-strict'	blob \| commitdiff \| raw
2009-04-18	Junio C Hamano	Merge branch 'da/difftool'	blob \| commitdiff \| raw
2009-04-18	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw \| diff to current
2009-04-12	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw \| diff to current
2009-04-12	David Aguilar	mergetool--lib: simplify API usage by removing more...	blob \| commitdiff \| raw
2009-04-11	Ferry Huberts	Fix misspelled mergetool.keepBackup	blob \| commitdiff \| raw \| diff to current
2009-04-09	Junio C Hamano	Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...	blob \| commitdiff \| raw \| diff to current
2009-04-09	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw \| diff to current
2009-04-09	Junio C Hamano	Merge branch 'jc/maint-1.6.0-keep-pack' into maint	blob \| commitdiff \| raw \| diff to current
2009-04-09	Junio C Hamano	Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-04-09	Junio C Hamano	Merge branch 'bc/maint-1.6.1-branch-deleted-was' into...	blob \| commitdiff \| raw \| diff to current
2009-04-08	David Aguilar	difftool/mergetool: refactor commands to use git-merget...	blob \| commitdiff \| raw \| diff to current
2009-04-08	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw \| diff to current
2009-04-08	Junio C Hamano	Merge branch 'bs/maint-1.6.0-tree-walk-prefix'	blob \| commitdiff \| raw \| diff to current
2009-04-08	David Aguilar	mergetool: use $( ... ) instead of `backticks`	blob \| commitdiff \| raw \| diff to current
2009-04-08	Sebastian Pipping	difftool/mergetool: add diffuse as merge and diff tool	blob \| commitdiff \| raw \| diff to current
2009-04-08	Markus Heidelberg	git-mergetool: add new merge tool TortoiseMerge	blob \| commitdiff \| raw \| diff to current
2009-04-08	Markus Heidelberg	git-mergetool/difftool: make (g)vimdiff workable under...	blob \| commitdiff \| raw \| diff to current
2009-04-05	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw \| diff to current
2009-04-02	Junio C Hamano	Merge branch 'jc/maint-1.6.0-blame-s' into maint	blob \| commitdiff \| raw \| diff to current
2009-04-02	Junio C Hamano	Merge branch 'js/maint-1.6.0-exec-path-env' into maint	blob \| commitdiff \| raw \| diff to current
2009-04-02	Junio C Hamano	Merge branch 'bc/maint-1.6.1-branch-deleted-was' into...	blob \| commitdiff \| raw \| diff to current
2009-04-02	Junio C Hamano	Merge branch 'tr/maint-1.6.1-doc-format-patch--root...	blob \| commitdiff \| raw \| diff to current
2009-04-02	Junio C Hamano	Merge branch 'tr/maint-1.6.1-doc-format-patch--root'	blob \| commitdiff \| raw \| diff to current
2009-04-02	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw \| diff to current
2009-04-02	Junio C Hamano	Merge branch 'jc/maint-1.6.0-keep-pack'	blob \| commitdiff \| raw \| diff to current
2009-03-30	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw \| diff to current
2009-03-30	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw \| diff to current
2009-03-28	Junio C Hamano	Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'	blob \| commitdiff \| raw \| diff to current
2009-03-28	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw \| diff to current
2009-03-26	Junio C Hamano	Merge branch 'jc/maint-1.6.0-blame-s'	blob \| commitdiff \| raw \| diff to current
2009-03-26	Junio C Hamano	Merge branch 'js/maint-1.6.0-exec-path-env'	blob \| commitdiff \| raw \| diff to current
2009-03-26	Junio C Hamano	Merge branch 'bc/maint-1.6.1-branch-deleted-was'	blob \| commitdiff \| raw \| diff to current
2009-03-24	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw \| diff to current
2009-03-22	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw \| diff to current
2009-03-22	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw \| diff to current
2009-03-22	Junio C Hamano	Merge branch 'tr/maint-1.6.0-send-email-irt' into maint	blob \| commitdiff \| raw \| diff to current
2009-03-22	Junio C Hamano	Merge branch 'mg/maint-submodule-normalize-path' into...	blob \| commitdiff \| raw \| diff to current
2009-03-22	Junio C Hamano	Merge branch 'jc/maint-1.6.0-read-tree-overlay' into...	blob \| commitdiff \| raw \| diff to current
2009-03-18	Junio C Hamano	Merge branch 'jc/maint-1.6.0-read-tree-overlay'	blob \| commitdiff \| raw \| diff to current
2009-03-18	Junio C Hamano	Merge branch 'tr/maint-1.6.0-send-email-irt'	blob \| commitdiff \| raw \| diff to current
2009-03-13	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw \| diff to current
2009-03-11	Junio C Hamano	Merge branch 'fg/maint-exclude-bq' into maint	blob \| commitdiff \| raw \| diff to current
2009-03-11	Junio C Hamano	Merge branch 'en/maint-hash-object' into maint	blob \| commitdiff \| raw \| diff to current
2009-03-11	Junio C Hamano	Merge branch 'mg/maint-submodule-normalize-path'	blob \| commitdiff \| raw \| diff to current
2009-03-11	Junio C Hamano	Merge branch 'jc/maint-1.6.0-keep-pack'	blob \| commitdiff \| raw \| diff to current
2009-03-08	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw \| diff to current
2009-03-05	Junio C Hamano	Merge branch 'en/maint-hash-object'	blob \| commitdiff \| raw \| diff to current
2009-03-05	Junio C Hamano	Merge branch 'jc/blame'	blob \| commitdiff \| raw \| diff to current
2009-03-05	Junio C Hamano	Merge branch 'fg/exclude-bq'	blob \| commitdiff \| raw \| diff to current
2009-03-05	Junio C Hamano	Merge branch 'js/valgrind'	blob \| commitdiff \| raw \| diff to current
2009-03-02	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2009-03-01	Junio C Hamano	Merge branch 'jc/maint-1.6.0-pack-directory'	blob \| commitdiff \| raw \| diff to current
2009-02-28	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-02-28	Junio C Hamano	Merge branch 'cc/maint-1.6.0-bisect-fix'	blob \| commitdiff \| raw \| diff to current
2009-02-27	Junio C Hamano	Merge branch 'cc/maint-1.6.0-bisect-fix'	blob \| commitdiff \| raw \| diff to current
2009-02-25	Junio C Hamano	Merge branch 'jc/maint-1.6.0-pack-directory'	blob \| commitdiff \| raw \| diff to current
2009-02-20	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-02-18	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-02-15	Junio C Hamano	Merge branch 'ms/mailmap'	blob \| commitdiff \| raw \| diff to current
2009-02-15	Junio C Hamano	Merge branch 'rc/http-push'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom