Merge branch 'mr/gitweb-snapshot'
[gitweb.git] / merge-recursive.c
2009-06-21 Fix various sparse warnings in the git source code
2009-06-21 Merge branch 'ph/submodule-rebase'
2009-06-21 Merge branch 'jc/cache-tree'
2009-06-21 Merge branch 'pb/maint-1.6.2-userdiff-fix'
2009-06-21 Merge branch 'sb/maint-1.6.0-add-config-fix'
2009-06-20 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-06-14 Merge branch 'maint-1.6.2' into maint
2009-06-14 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-06-14 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-06-13 Merge branch 'rc/http-push'
2009-06-13 Merge branch 'cc/bisect' (early part)
2009-06-13 Merge branch 'rc/maint-http-local-slot-fix'
2009-06-13 Merge branch 'ph/submodule-rebase' (early part)
2009-06-13 Merge branch 'da/araxis-mergetool'
2009-06-11 Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
2009-06-02 Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
2009-06-02 Merge branch 'rs/maint-grep-word-regexp-fix' into maint
2009-06-02 Merge branch 'sb/maint-1.6.2-opt-filename-fix' into...
2009-06-02 Merge branch 'jc/maint-add-p-coalesce-fix' into maint
2009-05-31 Merge branch 'jc/solaris-0811'
2009-05-31 Merge branch 'sb/show-branch-parse-options'
2009-05-31 Merge branch 'sb/format-patch-parseopt'
2009-05-31 Merge branch 'jc/mktree'
2009-05-31 Merge branch 'mw/send-email'
2009-05-31 Merge branch 'cc/bisect' (early part)
2009-05-31 t9139 uses ancient, backwards-compatible iconv names
2009-05-29 Merge branch 'sb/maint-1.6.2-opt-filename-fix'
2009-05-29 Merge branch 'jc/maint-add-p-coalesce-fix'
2009-05-29 Merge branch 'rs/maint-grep-word-regexp-fix'
2009-05-26 Merge branch 'js/maint-no-ln-across-libexec-and-bin...
2009-05-26 Merge branch 'lt/maint-diff-reduce-lstat' into maint
2009-05-26 Merge branch 'jm/format-patch-no-auto-n-when-k-is-given...
2009-05-26 Merge branch 'do/maint-merge-recursive-fix' into maint
2009-05-26 Merge branch 'jk/maint-1.6.0-trace-argv' into maint
2009-05-25 Merge branch 'jc/mktree' into sb/opt-filename
2009-05-25 Merge branch 'sb/format-patch-parseopt' into sb/opt...
2009-05-25 Merge branch 'sb/show-branch-parse-options' into sb...
2009-05-25 Merge branch 'master' into sb/opt-filename
2009-05-24 Merge branch 'maint'
2009-05-24 Merge branch 'maint-1.6.2' into maint
2009-05-24 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-05-24 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-05-23 Merge branch 'jn/gitweb-cleanup'
2009-05-23 Merge branch 'mg/track'
2009-05-23 Merge branch 'fc/decorate-tag'
2009-05-23 Merge branch 'tp/send-email-from-config'
2009-05-23 Merge branch 'js/maint-no-ln-across-libexec-and-bin'
2009-05-23 Merge branch 'da/mergetool-lib'
2009-05-23 Merge branch 'cc/bisect' (early part)
2009-05-23 Merge branch 'lt/maint-diff-reduce-lstat'
2009-05-23 Merge branch 'jm/format-patch-no-auto-n-when-k-is-given'
2009-05-23 Merge branch 'do/maint-merge-recursive-fix'
2009-05-23 Merge branch 'jk/maint-1.6.0-trace-argv'
2009-05-23 Merge branch 'mh/show-branch-color' into sb/show-branch...
2009-05-18 Merge branch 'js/add-edit'
2009-05-18 Merge branch 'mh/diff-stat-color'
2009-05-18 Merge branch 'mh/show-branch-color'
2009-05-18 Merge branch 'ac/graph-horizontal-line'
2009-05-18 Merge branch 'ae/anon-fetch-info'
2009-05-16 Merge branch 'maint-1.6.2' into maint
2009-05-14 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-05-14 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-05-12 Merge branch 'maint-1.6.2' into maint
2009-05-10 merge-recursive: never leave index unmerged while recursing
2009-05-09 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-05-09 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-05-06 Merge branch 'maint'
2009-05-06 Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maint
2009-05-06 Merge branch 'maint-1.6.0' into maint
2009-05-03 Sync with GIT 1.6.2.5
2009-05-03 Merge branch 'maint-1.6.1' into maint
2009-05-03 Merge branch 'mm/maint-add-p-quit' into maint
2009-05-03 Merge branch 'lt/pack-object-memuse' into maint
2009-05-03 Merge branch 'jc/maint-1.6.0-keep-pack' into maint...
2009-05-03 Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-05-03 Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into...
2009-05-02 Merge git://repo.or.cz/git-gui
2009-05-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-04-29 Merge branch 'maint'
2009-04-29 merge-recursive: do not die on a conflicting submodule
2009-04-29 Merge branch 'maint-1.6.1' into maint
2009-04-29 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-28 Merge branch 'maint'
2009-04-28 Merge branch 'maint-1.6.1' into maint
2009-04-28 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-25 Merge branch 'maint'
2009-04-25 Merge branch 'maint-1.6.1' into maint
2009-04-25 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-23 Merge branch 'jc/maint-read-tree-multi'
2009-04-21 Merge branch 'mk/maint-apply-swap'
2009-04-21 Merge branch 'maint'
2009-04-20 Merge branch 'mm/maint-add-p-quit'
2009-04-20 Sync with 1.6.2.4
2009-04-19 Merge branch 'ef/maint-fast-export' into maint
2009-04-19 Merge branch 'mm/maint-add-p-quit' into maint
2009-04-19 Merge branch 'lt/maint-reflog-expire' into maint
2009-04-19 Merge branch 'jc/maint-shared-literally' into maint
2009-04-18 Merge branch 'lt/pack-object-memuse'
2009-04-18 Merge branch 'maint'
2009-04-18 Merge branch 'maint-1.6.1' into maint
next