Andrew's git / gitweb.git / history
?
Merge branch 'maint'
[gitweb.git] / Documentation / merge-config.txt
2009-01-13 Merge branch 'cb/maint-merge-recursive-fix' into maint blob | diff | raw
2009-01-13 Merge branch 'ap/maint-apply-modefix' into maint blob | diff | raw
2009-01-13 Merge branch 'maint-1.6.0' into maint blob | diff | raw
2009-01-12 Merge branch 'jc/maint-do-not-switch-to-non-commit... 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-1.6.0' into maint blob | diff | raw
2009-01-07 Merge branch 'maint-1.5.6' into maint-1.6.0 blob | diff | raw | diff to current
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
2008-12-27 Merge branch 'sp/maint-describe-all-tag-warning' into... blob | diff | raw
2008-12-22 Merge branch 'maint' blob | diff | raw
2008-12-22 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2008-12-20 Merge branch 'maint' to sync with GIT 1.6.0.6 blob | diff | raw
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
2008-12-17 GIT 1.5.6.6 v1.5.6.6 blob | diff | raw | diff to current
2008-12-16 Merge branch 'maint' blob | diff | raw
2008-12-15 Merge branch 'cb/maint-merge-recursive-fix' into cb... blob | diff | raw
2008-12-13 Merge branch 'maint' blob | diff | raw
2008-12-11 Merge branch 'maint' blob | diff | raw
2008-12-10 Merge branch 'maint' blob | diff | raw
2008-12-10 Improve language in git-merge.txt and related docs blob | diff | raw
2008-12-07 Merge branch 'maint' blob | diff | raw | diff to current
2008-12-03 Merge branch 'maint' blob | diff | raw | diff to current
2008-12-03 Merge branch 'maint' 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-12-01 Merge branch 'maint' blob | diff | raw | diff to current
2008-11-29 Merge branch 'nd/narrow' (early part) into jc/add-i-t-a blob | diff | raw | diff to current
2008-11-28 Merge branch 'cc/bisect-skip' blob | diff | raw | diff to current
2008-11-28 Merge branch 'js/mingw-rename-fix' blob | diff | raw | diff to current
2008-11-28 Merge branch 'st/levenshtein' blob | diff | raw | diff to current
2008-11-28 Merge branch 'cr/remote-update-v' blob | diff | raw | diff to current
2008-11-28 Merge branch 'rs/strbuf-expand' blob | diff | raw | diff to current
2008-11-28 Merge branch 'mv/clone-strbuf' blob | diff | raw | diff to current
2008-11-28 Merge branch 'lt/preload-lstat' blob | diff | raw | diff to current
2008-11-28 Merge branch 'ta/quiet-pull' blob | diff | raw | diff to current
2008-11-28 Merge branch 'ph/send-email' blob | diff | raw | diff to current
2008-11-28 Merge branch 'maint' blob | diff | raw | diff to current
2008-11-27 Merge branch 'rw/maint-typofix' into rw/typofix blob | diff | raw | diff to current
2008-11-26 Merge branch 'maint' blob | diff | raw | diff to current
2008-11-26 Merge branch 'mm/sort-config-doc' blob | diff | raw | diff to current
2008-11-26 Merge branch 'mm/maint-sort-config-doc' into mm/sort... blob | diff | raw | diff to current
2008-11-16 Merge git://repo.or.cz/git-gui 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-10-18 Merge branch 'pb/commit-where' blob | diff | raw | diff to current
2008-10-09 Merge branch 'lt/time-reject-fractional-seconds' blob | diff | raw | diff to current
2008-10-09 Merge branch 'jc/add-ita' blob | diff | raw | diff to current
2008-09-29 Merge branch 'jc/better-conflict-resolution' blob | diff | raw | diff to current
2008-09-25 Merge branch 'mv/merge-recursive' blob | diff | raw | diff to current
2008-09-25 Merge branch 'jc/alternate-push' blob | diff | raw | diff to current
2008-09-25 Merge branch 'am/status' blob | diff | raw | diff to current
2008-09-25 Merge branch 'pb/autocorrect-wrapper' blob | diff | raw | diff to current
2008-09-25 Merge branch 'mv/commit-tree' blob | diff | raw | diff to current
2008-09-25 Merge branch 'jc/apply-include-exclude' blob | diff | raw | diff to current
2008-09-25 Merge branch 'jc/safe-c-l-d' blob | diff | raw | diff to current
2008-09-25 Merge branch 'ho/dirstat-by-file' 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 'bc/maint-diff-hunk-header-fix' into bc... blob | diff | raw | diff to current
2008-09-19 Merge branch 'jc/diff-prefix' blob | diff | raw | diff to current
2008-09-19 Merge branch 'np/pack' blob | diff | raw | diff to current
2008-09-19 Merge branch 'bw/shortref' blob | diff | raw | diff to current
2008-09-19 Merge branch 'rs/decorate' blob | diff | raw | diff to current
2008-09-19 Merge branch 'tr/rev-list-reverse' blob | diff | raw | diff to current
2008-09-19 Merge branch 'cc/bisect' blob | diff | raw | diff to current
2008-09-19 Merge branch 'jc/setlinebuf-setvbuf' blob | diff | raw | diff to current
2008-09-19 Merge branch 'dp/maint-rebase-fix' into maint blob | diff | raw | diff to current
2008-09-19 Merge branch 'jc/maint-checkout-keep-remove' into maint blob | diff | raw | diff to current
2008-09-19 Merge branch 'jc/maint-diff-quiet' into maint blob | diff | raw | diff to current
2008-09-19 Merge branch 'jc/maint-name-hash-clear' into maint blob | diff | raw | diff to current
2008-09-19 Merge branch 'jc/maint-template-permbits' into maint blob | diff | raw | diff to current
2008-09-19 Merge branch 'mh/maint-honor-no-ssl-verify' into maint blob | diff | raw | diff to current
2008-09-16 Merge branch 'dp/maint-rebase-fix' blob | diff | raw | diff to current
2008-09-16 Merge branch 'jc/maint-checkout-keep-remove' blob | diff | raw | diff to current
2008-09-16 Merge branch 'jc/maint-diff-quiet' blob | diff | raw | diff to current
2008-09-16 Merge branch 'jc/maint-name-hash-clear' blob | diff | raw | diff to current
2008-09-16 Merge branch 'jc/maint-template-permbits' blob | diff | raw | diff to current
2008-09-16 Merge branch 'mh/maint-honor-no-ssl-verify' blob | diff | raw | diff to current
2008-09-13 Sync with 1.6.0.2 blob | diff | raw | diff to current
2008-09-12 Merge branch 'ho/maint-dashless' into maint blob | diff | raw | diff to current
2008-09-12 Fix some manual typos. 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
next