Merge branch 'ks/maint-mailinfo-folded'
[gitweb.git] / Documentation / merge-config.txt
2009-02-01 Merge branch 'ks/maint-mailinfo-folded'
2009-02-01 Merge branch 'maint-1.6.0' into maint
2009-01-29 Merge branch 'jc/maint-format-patch-o-relative' into...
2009-01-29 Merge branch 'bs/maint-rename-populate-filespec' into...
2009-01-29 Merge branch 'maint-1.6.0' into maint
2009-01-27 Merge branch 'maint-1.6.0' into maint
2009-01-27 Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into...
2009-01-26 Merge branch 'js/maint-all-implies-HEAD'
2009-01-24 Merge branch 'cb/maint-unpack-trees-absense' into maint
2009-01-24 Merge branch 'tr/maint-no-index-fixes' into maint
2009-01-24 Merge branch 'jc/maint-format-patch' into maint
2009-01-24 Merge branch 'maint-1.6.0' into maint
2009-01-22 Merge branch 'kc/maint-diff-bwi-fix'
2009-01-22 Merge branch 'lt/maint-wrap-zlib'
2009-01-22 Merge branch 'sg/maint-gitdir-in-subdir'
2009-01-22 Merge branch 'jc/maint-format-patch-o-relative'
2009-01-21 Merge branch 'bs/maint-rename-populate-filespec'
2009-01-20 Merge branch 'kc/maint-diff-bwi-fix'
2009-01-18 Merge branch 'ds/uintmax-config'
2009-01-18 Merge branch 'gb/gitweb-patch'
2009-01-18 Merge branch 'jc/maint-format-patch'
2009-01-18 Merge branch 'tr/maint-no-index-fixes'
2009-01-18 Merge branch 'maint-1.6.0' into maint
2009-01-15 Merge branch 'maint-1.6.0' into maint
2009-01-15 Merge branch 'maint-1.6.0' into maint
2009-01-14 Merge branch 'maint-1.6.0' into maint
2009-01-14 Merge branch 'js/bundle-tags'
2009-01-14 Merge branch 'cb/maint-unpack-trees-absense'
2009-01-13 Merge branch 'cb/maint-merge-recursive-fix' into maint
2009-01-13 Merge branch 'ap/maint-apply-modefix' into maint
2009-01-13 Merge branch 'maint-1.6.0' into maint
2009-01-12 Merge branch 'jc/maint-do-not-switch-to-non-commit...
2009-01-07 Merge branch 'jn/gitweb-blame'
2009-01-07 Merge branch 'wp/add-p-goto'
2009-01-07 Merge branch 'maint-1.6.0' into maint
2009-01-07 Merge branch 'maint-1.5.6' into maint-1.6.0
2009-01-03 Merge branch 'jc/maint-do-not-switch-to-non-commit'
2009-01-03 Merge branch 'ap/maint-apply-modefix'
2009-01-01 Merge branch 'cb/mergetool'
2008-12-29 Merge branch 'lt/reset-merge'
2008-12-27 Merge branch 'sp/maint-describe-all-tag-warning' into...
2008-12-22 Merge branch 'maint'
2008-12-22 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-20 Merge branch 'maint' to sync with GIT 1.6.0.6
2008-12-20 GIT 1.6.0.6 v1.6.0.6
2008-12-18 Merge git://repo.or.cz/git-gui
2008-12-17 GIT 1.5.6.6 v1.5.6.6
2008-12-16 Merge branch 'maint'
2008-12-15 Merge branch 'cb/maint-merge-recursive-fix' into cb...
2008-12-13 Merge branch 'maint'
2008-12-11 Merge branch 'maint'
2008-12-10 Merge branch 'maint'
2008-12-10 Improve language in git-merge.txt and related docs
2008-12-07 Merge branch 'maint'
2008-12-03 Merge branch 'maint'
2008-12-03 Merge branch 'maint'
2008-12-02 Merge git://repo.or.cz/git-gui
2008-12-02 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Merge git://repo.or.cz/git-gui
2008-12-01 Merge branch 'maint'
2008-11-29 Merge branch 'nd/narrow' (early part) into jc/add-i-t-a
2008-11-28 Merge branch 'cc/bisect-skip'
2008-11-28 Merge branch 'js/mingw-rename-fix'
2008-11-28 Merge branch 'st/levenshtein'
2008-11-28 Merge branch 'cr/remote-update-v'
2008-11-28 Merge branch 'rs/strbuf-expand'
2008-11-28 Merge branch 'mv/clone-strbuf'
2008-11-28 Merge branch 'lt/preload-lstat'
2008-11-28 Merge branch 'ta/quiet-pull'
2008-11-28 Merge branch 'ph/send-email'
2008-11-28 Merge branch 'maint'
2008-11-27 Merge branch 'rw/maint-typofix' into rw/typofix
2008-11-26 Merge branch 'maint'
2008-11-26 Merge branch 'mm/sort-config-doc'
2008-11-26 Merge branch 'mm/maint-sort-config-doc' into mm/sort...
2008-11-16 Merge git://repo.or.cz/git-gui
2008-11-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-11-13 Merge git://repo.or.cz/git-gui
2008-11-02 Merge git://repo.or.cz/git-gui
2008-11-02 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-10-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-10-18 Merge branch 'pb/commit-where'
2008-10-09 Merge branch 'lt/time-reject-fractional-seconds'
2008-10-09 Merge branch 'jc/add-ita'
2008-09-29 Merge branch 'jc/better-conflict-resolution'
2008-09-25 Merge branch 'mv/merge-recursive'
2008-09-25 Merge branch 'jc/alternate-push'
2008-09-25 Merge branch 'am/status'
2008-09-25 Merge branch 'pb/autocorrect-wrapper'
2008-09-25 Merge branch 'mv/commit-tree'
2008-09-25 Merge branch 'jc/apply-include-exclude'
2008-09-25 Merge branch 'jc/safe-c-l-d'
2008-09-25 Merge branch 'ho/dirstat-by-file'
2008-09-25 Merge git://repo.or.cz/git-gui
2008-09-19 Merge branch 'bc/maint-diff-hunk-header-fix' into bc...
2008-09-19 Merge branch 'jc/diff-prefix'
2008-09-19 Merge branch 'np/pack'
2008-09-19 Merge branch 'bw/shortref'
2008-09-19 Merge branch 'rs/decorate'
next