Andrew's git / gitweb.git / history
?
color-words: take an optional regular expression describing words
[gitweb.git] / Documentation / git-mergetool.txt
2009-01-13 Merge branch 'maint' blob | diff | raw
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-13 Merge branch 'maint-1.6.0' into maint blob | diff | raw | diff to current
2009-01-12 Merge branch 'maint' blob | diff | raw
2009-01-12 Merge branch 'jc/maint-do-not-switch-to-non-commit... blob | diff | raw | diff to current
2009-01-07 Merge branch 'mh/maint-sendmail-cc-doc' blob | diff | raw
2009-01-07 Merge branch 'rs/diff-ihc' blob | diff | raw
2009-01-07 Merge branch 'js/maint-merge-recursive-r-d-conflict' blob | diff | raw
2009-01-07 Merge branch 'mk/gitweb-feature' blob | diff | raw
2009-01-07 Merge branch 'cb/merge-recursive-fix' blob | diff | raw
2009-01-07 Merge branch 'kk/maint-http-push' blob | diff | raw
2009-01-07 Merge branch 'mv/um-pdf' blob | diff | raw
2009-01-07 Merge branch 'jn/gitweb-blame' blob | diff | raw
2009-01-07 Merge branch 'wp/add-p-goto' blob | diff | raw
2009-01-07 Merge branch 'maint' blob | diff | raw
2009-01-07 Merge branch 'maint-1.6.0' into 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
2009-01-03 Merge branch 'jc/maint-do-not-switch-to-non-commit' blob | diff | raw
2009-01-03 Merge branch 'ap/maint-apply-modefix' blob | diff | raw
2009-01-01 Merge branch 'cb/mergetool' blob | diff | raw
2008-12-29 Merge branch 'lt/reset-merge' 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 branch 'maint' 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-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-16 Merge branch 'maint' blob | diff | raw | diff to current
2008-12-15 Merge branch 'cb/maint-merge-recursive-fix' into cb... blob | diff | raw | diff to current
2008-12-13 Merge branch 'maint' blob | diff | raw | diff to current
2008-12-11 Merge branch 'maint' blob | diff | raw | diff to current
2008-12-10 Merge branch 'maint' blob | diff | raw | diff to current
2008-12-10 Improve language in git-merge.txt and related docs 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-13 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2008-11-13 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-11-02 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-11-02 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw | diff to current
2008-10-21 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2008-09-25 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-09-19 Merge branch 'tr/rev-list-reverse' blob | diff | raw | diff to current
2008-09-07 Merge updated git-gui and gitk that call each other blob | diff | raw | diff to current
2008-09-06 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw | diff to current
2008-08-30 Merge branch 'jc/post-simplify' (early part) into tr... blob | diff | raw | diff to current
2008-08-28 Merge branch 'mv/merge-custom' blob | diff | raw | diff to current
2008-08-27 Merge branch 'jc/add-addremove' blob | diff | raw | diff to current
2008-08-21 Merge branch 'jc/add-stop-at-symlink' blob | diff | raw | diff to current
2008-08-21 Merge branch 'cc/merge-base-many' blob | diff | raw | diff to current
2008-08-20 Merge branch 'dp/hash-literally' blob | diff | raw | diff to current
2008-08-20 Merge branch 'ph/enable-threaded' blob | diff | raw | diff to current
2008-08-20 Merge branch 'jk/pager-swap' blob | diff | raw | diff to current
2008-08-20 Merge branch 'rs/imap' blob | diff | raw | diff to current
2008-08-17 Merge git-gui 0.11.0 blob | diff | raw | diff to current
2008-08-17 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2008-08-14 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-13 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-13 Merge branch 'jc/post-simplify' into tr/rev-list-docs blob | diff | raw | diff to current
2008-08-13 Merge branch 'jc/post-simplify' into tr/filter-branch blob | diff | raw | diff to current
2008-08-12 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-11 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-11 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-09 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-06 Sync with 1.5.6.5 blob | diff | raw | diff to current
2008-08-06 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-08-06 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2008-08-06 Merge branch 'rs/archive-parse-options' blob | diff | raw | diff to current
2008-08-06 Documentation: typos / spelling fixes blob | diff | raw | diff to current
2008-08-06 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-03 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-02 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-02 Merge branch 'maint' blob | diff | raw | diff to current
2008-07-30 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-07-27 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-07-25 Merge branch 'maint' blob | diff | raw | diff to current
2008-07-24 Merge branch 'maint' into ph/checkout blob | diff | raw | diff to current
2008-07-21 Merge branch 'maint' blob | diff | raw | diff to current
2008-07-19 Merge branch 'maint' blob | diff | raw | diff to current
2008-07-17 Merge branch 'sp/maint-index-pack' blob | diff | raw | diff to current
2008-07-17 Merge branch 'maint' blob | diff | raw | diff to current
2008-07-16 Merge branch 'mv/merge-in-c' blob | diff | raw | diff to current
2008-07-16 Merge branch 'ag/rewrite_one' blob | diff | raw | diff to current
2008-07-16 Merge branch 'js/maint-pretty-mailmap' blob | diff | raw | diff to current
2008-07-15 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-07-15 Merge branch 'ls/maint-mailinfo-patch-label' blob | diff | raw | diff to current
2008-07-15 Merge branch 'jc/branch-merged' blob | diff | raw | diff to current
2008-07-15 Merge branch 'sp/maint-bash-completion-optim' blob | diff | raw | diff to current
2008-07-13 Merge branch 'sp/maint-bash-completion-optim' blob | diff | raw | diff to current
2008-07-13 Merge branch 'maint' to sync with 1.5.6.3 blob | diff | raw | diff to current
2008-07-13 Merge branch 'ph/parseopt-step-blame' blob | diff | raw | diff to current
2008-07-13 Merge branch 'am/stash-branch' blob | diff | raw | diff to current
2008-07-13 Merge branch 'sg/stash-k-i' blob | diff | raw | diff to current
next