Merge branch 'as/autocorrect-alias'
[git] / merge-recursive.c
2009-01-18  Junio C HamanoMerge branch 'as/autocorrect-alias'
2009-01-18  Junio C HamanoMerge branch 'rs/maint-shortlog-foldline'
2009-01-18  Junio C HamanoMerge branch 'mh/maint-commit-color-status'
2009-01-18  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-01-15  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-01-15  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-01-14  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-01-14  Junio C HamanoMerge branch 'nd/grep-assume-unchanged'
2009-01-14  Junio C HamanoMerge branch 'as/maint-shortlog-cleanup'
2009-01-14  Junio C HamanoMerge branch 'jc/maint-ls-tree'
2009-01-14  Junio C HamanoMerge branch 'js/bundle-tags'
2009-01-14  Junio C HamanoMerge branch 'js/add-not-submodule'
2009-01-14  Junio C HamanoMerge branch 'pb/maint-git-pm-false-dir'
2009-01-14  Junio C HamanoMerge branch 'pj/maint-ldflags'
2009-01-14  Junio C HamanoMerge branch 'fe/cvsserver'
2009-01-14  Junio C HamanoMerge branch 'js/maint-bisect-gitk'
2009-01-14  Junio C HamanoMerge branch 'np/no-loosen-prune-expire-now'
2009-01-14  Junio C HamanoMerge branch 'cb/maint-unpack-trees-absense'
2009-01-14  Junio C HamanoMerge branch 'mc/cd-p-pwd'
2009-01-14  Junio C HamanoMerge branch 'mh/cherry-default'
2009-01-13  Junio C HamanoMerge branch 'kk/maint-http-push' into maint
2009-01-13  Junio C HamanoMerge branch 'js/maint-merge-recursive-r-d-conflict...
2009-01-13  Junio C HamanoMerge branch 'cb/maint-merge-recursive-fix' into maint
2009-01-13  Junio C HamanoMerge branch 'ap/maint-apply-modefix' into maint
2009-01-13  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-01-12  Junio C HamanoMerge branch 'maint'
2009-01-12  Junio C HamanoMerge branch 'jc/maint-do-not-switch-to-non-commit...
2009-01-07  Junio C HamanoMerge branch 'mh/maint-sendmail-cc-doc'
2009-01-07  Junio C HamanoMerge branch 'rs/diff-ihc'
2009-01-07  Junio C HamanoMerge branch 'js/maint-merge-recursive-r-d-conflict'
2009-01-07  Junio C HamanoMerge branch 'mk/gitweb-feature'
2009-01-07  Junio C HamanoMerge branch 'cb/merge-recursive-fix'
2009-01-07  Junio C HamanoMerge branch 'wp/add-p-goto'
2009-01-07  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-01-03  Junio C HamanoMerge branch 'jc/maint-do-not-switch-to-non-commit'
2009-01-03  Junio C HamanoMerge branch 'ap/maint-apply-modefix'
2009-01-01  Junio C HamanoMerge branch 'cb/mergetool'
2008-12-29  Junio C HamanoMerge branch 'lt/reset-merge'
2008-12-27  Junio C HamanoMerge branch 'sp/maint-describe-all-tag-warning' into...
2008-12-25  Johannes Schindelinmerge-recursive: mark rename/delete conflict as unmerged
2008-12-22  Junio C HamanoMerge branch 'maint'
2008-12-22  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-20  Junio C HamanoMerge branch 'maint' to sync with GIT 1.6.0.6
2008-12-18  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-12-17  Junio C HamanoGIT 1.5.5.6 v1.5.5.6
2008-12-16  Junio C HamanoMerge branch 'maint'
2008-12-15  Junio C HamanoMerge branch 'cb/maint-merge-recursive-fix' into cb...
2008-12-13  Junio C HamanoMerge branch 'maint'
2008-12-11  Junio C HamanoMerge branch 'maint'
2008-12-10  Junio C HamanoMerge branch 'maint'
2008-12-07  Junio C HamanoMerge branch 'maint'
2008-12-06  Junio C HamanoMerge branch 'jc/am-options'
2008-12-05  Alex RiesenReport symlink failures in merge-recursive
2008-12-03  Junio C HamanoMerge branch 'maint'
2008-12-03  Junio C HamanoMerge branch 'maint'
2008-12-02  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-12-02  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-12-01  Junio C HamanoMerge branch 'maint'
2008-11-29  Junio C HamanoMerge branch 'nd/narrow' (early part) into jc/add-i-t-a
2008-11-28  Junio C HamanoMerge branch 'cc/bisect-skip'
2008-11-28  Junio C HamanoMerge branch 'js/mingw-rename-fix'
2008-11-28  Junio C HamanoMerge branch 'st/levenshtein'
2008-11-28  Junio C HamanoMerge branch 'cr/remote-update-v'
2008-11-28  Junio C HamanoMerge branch 'rs/strbuf-expand'
2008-11-28  Junio C HamanoMerge branch 'maint'
2008-11-27  Junio C HamanoMerge branch 'rw/maint-typofix' into rw/typofix
2008-11-26  Junio C HamanoMerge branch 'maint'
2008-11-26  Junio C HamanoMerge branch 'mm/maint-sort-config-doc' into mm/sort...
2008-11-24  Junio C HamanoMerge branch 'maint'
2008-11-24  RenĂ© Scharfemerge-recursive: use strbuf_expand() instead of interpo...
2008-11-17  Junio C HamanoMerge branch 'maint'
2008-11-16  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-11-16  Junio C HamanoMerge branch 'maint'
2008-11-16  Junio C HamanoMerge branch 'bc/maint-keep-pack'
2008-11-15  Junio C HamanoMerge branch 'maint'
2008-11-14  Junio C HamanoMerge branch 'maint'
2008-11-13  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-11-13  Junio C HamanoMerge branch 'jn/gitweb-customlinks'
2008-11-13  Junio C HamanoMerge branch 'jk/maint-commit-v-strip'
2008-11-13  Junio C HamanoMerge branch 'mk/maint-cg-push'
2008-11-13  Junio C HamanoMerge branch 'bc/maint-keep-pack'
2008-11-13  Junio C HamanoMerge branch 'st/tag'
2008-11-13  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-11-12  Junio C HamanoMerge branch 'maint'
2008-11-12  Junio C HamanoMerge branch 'jk/maint-commit-v-strip' into jk/commit...
2008-11-11  Junio C HamanoMerge branch 'maint'
2008-11-09  Junio C HamanoMerge branch 'maint'
2008-11-09  Junio C HamanoMerge branch 'maint'
2008-11-09  Junio C HamanoMerge branch 'rs/blame'
2008-11-05  Junio C HamanoMerge branch 'jc/gitweb-fix-cloud-tag'
2008-11-05  Junio C HamanoMerge branch 'mv/maint-branch-m-symref'
2008-11-05  Junio C HamanoMerge branch 'mv/parseopt-checkout-index'
2008-11-04  Junio C HamanoMerge branch 'maint'
2008-11-03  Junio C HamanoMerge branch 'maint'
2008-11-03  Junio C HamanoMerge branch 'np/index-pack'
2008-11-03  Junio C HamanoMerge branch 'sh/rebase-i-p'
2008-11-03  Junio C HamanoMerge branch 'cj/maint-gitpm-fix-maybe-self'
2008-11-02  Junio C HamanoMerge branch 'maint'
next