Andrew's git - gitweb.git/history

[gitweb.git] / git-mergetool.sh

2009-02-01	Merge branch 'jc/maint-split-diff-metainfo'	blob \| diff \| raw
2009-02-01	Merge branch 'sp/runtime-prefix'	blob \| diff \| raw
2009-02-01	Merge branch 'jk/signal-cleanup'	blob \| diff \| raw
2009-02-01	Merge branch 'jg/mergetool'	blob \| diff \| raw
2009-02-01	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-01-31	mergetool: fix running mergetool in sub-directories	blob \| diff \| raw \| diff to current
2009-01-29	Sync with 1.6.1.2	blob \| diff \| raw \| diff to current
2009-01-28	Merge branch 'tr/previous-branch'	blob \| diff \| raw \| diff to current
2009-01-28	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-01-27	mergetool: respect autocrlf by using checkout-index	blob \| diff \| raw \| diff to current
2009-01-27	mergetool: Don't repeat merge tool candidates	blob \| diff \| raw
2009-01-26	Merge branch 'kb/lstat-cache'	blob \| diff \| raw \| diff to current
2009-01-26	Merge branch 'js/diff-color-words'	blob \| diff \| raw \| diff to current
2009-01-26	Merge branch 'cb/add-pathspec'	blob \| diff \| raw \| diff to current
2009-01-26	Merge branch 'js/maint-all-implies-HEAD'	blob \| diff \| raw \| diff to current
2009-01-26	Sync with 1.6.1.1	blob \| diff \| raw \| diff to current
2009-01-24	Merge branch 'js/patience-diff'	blob \| diff \| raw \| diff to current
2009-01-24	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-01-24	Merge branch 'cb/maint-unpack-trees-absense' into maint	blob \| diff \| raw \| diff to current
2009-01-24	Merge branch 'tr/maint-no-index-fixes' into maint	blob \| diff \| raw \| diff to current
2009-01-22	Merge branch 'kc/maint-diff-bwi-fix'	blob \| diff \| raw \| diff to current
2009-01-22	Merge branch 'lt/maint-wrap-zlib'	blob \| diff \| raw \| diff to current
2009-01-22	Merge branch 'am/maint-push-doc'	blob \| diff \| raw \| diff to current
2009-01-22	Merge branch 'sg/maint-gitdir-in-subdir'	blob \| diff \| raw \| diff to current
2009-01-22	Merge branch 'jf/am-failure-report'	blob \| diff \| raw \| diff to current
2009-01-22	Merge branch 'rs/ctype'	blob \| diff \| raw \| diff to current
2009-01-22	Merge branch 'sb/hook-cleanup'	blob \| diff \| raw \| diff to current
2009-01-22	Merge branch 'jk/color-parse'	blob \| diff \| raw \| diff to current
2009-01-22	Merge branch 'jc/maint-format-patch-o-relative'	blob \| diff \| raw \| diff to current
2009-01-22	Merge branch 'kb/am-directory'	blob \| diff \| raw \| diff to current
2009-01-21	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-01-21	Merge branch 'bs/maint-rename-populate-filespec'	blob \| diff \| raw \| diff to current
2009-01-20	Merge branch 'kc/maint-diff-bwi-fix'	blob \| diff \| raw \| diff to current
2009-01-20	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-01-19	Merge git://git.bogomips.org/git-svn	blob \| diff \| raw \| diff to current
2009-01-18	mergetool: put the cursor on the editable file for Vim	blob \| diff \| raw \| diff to current
2009-01-18	Merge branch 'ds/uintmax-config'	blob \| diff \| raw \| diff to current
2009-01-18	Merge branch 'mv/apply-parse-opt'	blob \| diff \| raw \| diff to current
2009-01-18	Merge branch 'tr/rebase-root'	blob \| diff \| raw \| diff to current
2009-01-18	Merge branch 'gb/gitweb-patch'	blob \| diff \| raw \| diff to current
2009-01-18	Merge branch 'jc/maint-format-patch'	blob \| diff \| raw \| diff to current
2009-01-18	Merge branch 'tr/maint-no-index-fixes'	blob \| diff \| raw \| diff to current
2009-01-18	Merge branch 'rs/maint-shortlog-foldline'	blob \| diff \| raw \| diff to current
2009-01-18	Merge branch 'mh/maint-commit-color-status'	blob \| diff \| raw \| diff to current
2009-01-18	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-01-16	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-01-15	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'nd/grep-assume-unchanged'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'as/maint-shortlog-cleanup'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'jc/maint-ls-tree'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'js/bundle-tags'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'js/add-not-submodule'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'pb/maint-git-pm-false-dir'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'pj/maint-ldflags'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'fe/cvsserver'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'js/maint-bisect-gitk'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'np/no-loosen-prune-expire-now'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'cb/maint-unpack-trees-absense'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'mc/cd-p-pwd'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'mh/cherry-default'	blob \| diff \| raw \| diff to current
2009-01-13	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-01-13	Merge branch 'cb/maint-merge-recursive-fix' into maint	blob \| diff \| raw \| diff to current
2009-01-13	Merge branch 'ap/maint-apply-modefix' into maint	blob \| diff \| raw \| diff to current
2009-01-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-01-07	Merge branch 'mh/maint-sendmail-cc-doc'	blob \| diff \| raw \| diff to current
2009-01-07	Merge branch 'rs/diff-ihc'	blob \| diff \| raw \| diff to current
2009-01-07	Merge branch 'js/maint-merge-recursive-r-d-conflict'	blob \| diff \| raw \| diff to current
2009-01-07	Merge branch 'mk/gitweb-feature'	blob \| diff \| raw \| diff to current
2009-01-07	Merge branch 'cb/merge-recursive-fix'	blob \| diff \| raw \| diff to current
2009-01-07	Merge branch 'kk/maint-http-push'	blob \| diff \| raw \| diff to current
2009-01-07	Merge branch 'mv/um-pdf'	blob \| diff \| raw \| diff to current
2009-01-07	Merge branch 'jn/gitweb-blame'	blob \| diff \| raw \| diff to current
2009-01-07	Merge branch 'wp/add-p-goto'	blob \| diff \| raw \| diff to current
2009-01-07	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-01-07	Merge branch 'maint-1.5.6' into maint-1.6.0	blob \| diff \| raw \| diff to current
2009-01-06	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-01-03	Merge branch 'jc/maint-do-not-switch-to-non-commit'	blob \| diff \| raw \| diff to current
2009-01-03	Merge branch 'ap/maint-apply-modefix'	blob \| diff \| raw \| diff to current
2009-01-01	Merge branch 'cb/mergetool'	blob \| diff \| raw \| diff to current
2008-12-29	Merge branch 'lt/reset-merge'	blob \| diff \| raw \| diff to current
2008-12-29	Merge branch 'np/auto-thread'	blob \| diff \| raw \| diff to current
2008-12-27	Merge branch 'sp/maint-describe-all-tag-warning' into...	blob \| diff \| raw \| diff to current
2008-12-22	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-12-20	Merge branch 'maint' to sync with GIT 1.6.0.6	blob \| diff \| raw \| diff to current
2008-12-20	GIT 1.6.0.6 v1.6.0.6	blob \| diff \| raw \| diff to current
2008-12-20	git-mergetool: properly handle "git mergetool -- filename"	blob \| diff \| raw \| diff to current
2008-12-18	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-12-17	GIT 1.5.6.6 v1.5.6.6	blob \| diff \| raw \| diff to current
2008-12-17	GIT 1.5.5.6 v1.5.5.6	blob \| diff \| raw \| diff to current
2008-12-13	mergetool: Don't keep temporary merge files unless...	blob \| diff \| raw \| diff to current
2008-12-13	mergetool: Add prompt to continue after failing to...	blob \| diff \| raw \| diff to current
2008-12-02	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-12-02	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-12-01	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-12-01	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-11-16	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-11-15	Add -y/--no-prompt option to mergetool	blob \| diff \| raw \| diff to current
2008-11-15	Fix some tab/space inconsistencies in git-mergetool.sh	blob \| diff \| raw \| diff to current
2008-11-13	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
next