Merge branch 'sp/runtime-prefix'
[git] / builtin-merge.c
2009-02-01  Junio C HamanoMerge branch 'sp/runtime-prefix'
2009-02-01  Junio C HamanoMerge branch 'jk/signal-cleanup'
2009-02-01  Junio C HamanoMerge branch 'maint'
2009-02-01  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-01-29  Junio C HamanoSync with 1.6.1.2
2009-01-29  Junio C HamanoMerge branch 'jc/maint-format-patch-o-relative' into...
2009-01-29  Junio C HamanoMerge branch 'bs/maint-rename-populate-filespec' into...
2009-01-29  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-01-28  Junio C HamanoMerge branch 'tr/previous-branch'
2009-01-28  Junio C HamanoMerge branch 'maint'
2009-01-27  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-01-26  Junio C HamanoMerge branch 'kb/lstat-cache'
2009-01-26  Junio C HamanoMerge branch 'js/diff-color-words'
2009-01-26  Junio C HamanoMerge branch 'cb/add-pathspec'
2009-01-26  Junio C HamanoMerge branch 'js/maint-all-implies-HEAD'
2009-01-26  Junio C HamanoSync with 1.6.1.1
2009-01-24  Junio C HamanoMerge branch 'js/patience-diff'
2009-01-24  Junio C HamanoMerge branch 'maint'
2009-01-24  Junio C HamanoMerge branch 'cb/maint-unpack-trees-absense' into maint
2009-01-24  Junio C HamanoMerge branch 'tr/maint-no-index-fixes' into maint
2009-01-24  Junio C HamanoMerge branch 'jc/maint-format-patch' into maint
2009-01-24  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-01-22  Junio C HamanoMerge branch 'kc/maint-diff-bwi-fix'
2009-01-22  Junio C HamanoMerge branch 'lt/maint-wrap-zlib'
2009-01-22  Junio C HamanoMerge branch 'am/maint-push-doc'
2009-01-22  Junio C HamanoMerge branch 'sg/maint-gitdir-in-subdir'
2009-01-22  Junio C HamanoMerge branch 'jf/am-failure-report'
2009-01-22  Junio C HamanoMerge branch 'rs/ctype'
2009-01-22  Junio C HamanoMerge branch 'sb/hook-cleanup'
2009-01-22  Junio C HamanoMerge branch 'jc/maint-format-patch-o-relative'
2009-01-21  Junio C HamanoMerge branch 'bs/maint-rename-populate-filespec'
2009-01-20  Junio C HamanoMerge branch 'kc/maint-diff-bwi-fix'
2009-01-18  Junio C HamanoMerge branch 'ds/uintmax-config'
2009-01-18  Junio C HamanoMerge branch 'jc/maint-format-patch'
2009-01-18  Junio C HamanoMerge branch 'tr/maint-no-index-fixes'
2009-01-18  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-01-18  Stephan BeyerMove run_hook() from builtin-commit.c into run-command...
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 'js/bundle-tags'
2009-01-14  Junio C HamanoMerge branch 'cb/maint-unpack-trees-absense'
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 'jc/maint-do-not-switch-to-non-commit...
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-07  Junio C HamanoMerge branch 'maint-1.5.6' into maint-1.6.0
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-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-20  Junio C HamanoGIT 1.6.0.6 v1.6.0.6
2008-12-18  Junio C HamanoMerge git://repo.or.cz/git-gui
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 RiesenMake some of fwrite/fclose/write/close failures visible
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 'mv/clone-strbuf'
2008-11-28  Junio C HamanoMerge branch 'lt/preload-lstat'
2008-11-28  Junio C HamanoMerge branch 'ta/quiet-pull'
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-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-15  Tuncer AyazTeach/Fix pull/fetch -q/-v options
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'
next