rebase: Allow merge strategies to be used when rebasing
[gitweb.git] / git.c
2006-06-19 Merge branch 'jc/shared'
2006-06-18 Merge early part of branch 'jc/fetchupload'
2006-06-18 Merge branch 'jc/rw-prefix'
2006-06-18 Merge branch 'pe/date'
2006-06-17 fix git alias
2006-06-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-10 Merge git://git.kernel.org/pub/scm/git/gitweb
2006-06-10 Built-in git-get-tar-commit-id
2006-06-07 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-06 Merge branch 'jc/lockfile'
2006-06-06 Merge branch 'js/alias'
2006-06-06 git alias: try alias last.
2006-06-06 If you have a config containing something like this:
2006-06-04 Merge branch 'lt/tree-2'
2006-06-04 Merge branch 'sp/reflog'
2006-06-04 Merge branch 'ff/svnimport'
2006-06-04 Merge branch 'jc/fmt-patch'
2006-06-04 Builtin git-rev-parse.
2006-06-02 Merge branch 'nh/http'
2006-06-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-05-29 Merge branch 'jc/cache-tree'
2006-05-29 Merge branch 'lt/tree' into jc/lt-tree-n-cache-tree
2006-05-29 Merge branch 'jc/dirwalk-n-cache-tree' into jc/cache...
2006-05-28 Merge branch 'jc/mailinfo'
2006-05-28 Merge branch 'eb/mailinfo'
2006-05-24 Merge branch 'master' into sp/reflog
2006-05-24 Merge branch 'master' into lt/apply
2006-05-24 Builtin git-cat-file
2006-05-24 Merge branch 'jc/fmt-patch'
2006-05-24 Merge branch 'be/tag'
2006-05-24 Merge branch 'js/fmt-patch'
2006-05-24 Merge branch 'jc/builtin-n-tar-tree'
2006-05-24 Merge branch 'jc/fetch-sorted'
2006-05-24 Merge branch 'lt/dirwalk'
2006-05-23 Merge branch 'jc/tartree' into jc/builtin-n-tar-tree
2006-05-23 Builtin git-diff-files, git-diff-index, git-diff-stages...
2006-05-23 Builtin git-show-branch.
2006-05-23 Builtin git-apply.
2006-05-23 Builtin git-commit-tree.
2006-05-23 Builtin git-read-tree.
2006-05-23 Builtin git-tar-tree.
2006-05-23 Builtin git-ls-tree.
2006-05-23 Builtin git-ls-files.
2006-05-21 git-format-patch: now built-in.
2006-05-21 Merge branch 'master' into js/fmt-patch
2006-05-20 Merge branch 'lt/dirwalk' into jc/dirwalk-n-cache-tree
2006-05-20 Merge branch 'jc/cache-tree' into jc/dirwalk-n-cache...
2006-05-20 built-in tar-tree and remote tar-tree
2006-05-20 Merge branch 'js/fetchconfig'
2006-05-20 Add builtin "git rm" command
2006-05-20 Merge branch 'jc/read-tree-safety'
2006-05-19 Merge branch 'jc/apply'
2006-05-19 Merge branch 'eb/quilt'
2006-05-19 Merge branch 'jc/grep'
2006-05-19 Merge branch 'lt/grep'
2006-05-19 Merge branch 'ts/doctar'
2006-05-19 Builtin git-init-db
2006-05-19 Merge part of 'js/fmt-patch' for RFC2822 dates into...
2006-05-19 Merge early part of 'sp/reflog' branch
2006-05-18 Make git-check-format-ref a builtin.
2006-05-18 Make "git rev-list" be a builtin
2006-05-18 Merge branch 'maint'
2006-05-17 Merge branch 'jc/apply'
2006-05-17 Do "git add" as a builtin
2006-05-17 Merge branch 'maint'
2006-05-17 Merge branch 'np/pack'
2006-05-16 Merge branch 'se/tag'
2006-05-16 Merge branch 'se/rev-parse'
2006-05-16 Merge branch 'se/diff'
2006-05-16 Merge branch 'se/rebase'
2006-05-16 Merge branch 'lt/oneway'
2006-05-16 Merge branch 'ew/send-email'
2006-05-16 Merge branch 'lt/config'
2006-05-16 Merge branch 'jc/grep'
2006-05-15 Merge branch 'fix'
2006-05-15 Merge branch 'fix'
2006-05-14 Merge branch 'fix'
2006-05-14 Merge branch 'fix'
2006-05-13 Merge branch 'lt/fix-config' into lt/config
2006-05-10 Merge branch 'fix'
2006-05-09 Merge branch 'jc/xsha1'
2006-05-09 Merge branch 'np/delta'
2006-05-09 Merge branch 'fix'
2006-05-08 Merge branch 'fix'
2006-05-07 Merge branch 'fix'
2006-05-07 Merge with git://kernel.org/pub/scm/git/git.git
2006-05-06 Merge branch 'master' into js/fmt-patch
2006-05-05 Merge branch 'fix'
2006-05-04 Merge branch 'jc/logs'
2006-05-04 Merge branch 'jc/show-branch-dense'
2006-05-04 Merge branch 'jc/symref'
2006-05-04 Merge branch 'jc/diff'
2006-05-04 Merge branch 'js/repoconfig'
2006-05-04 Merge branch 'jc/count'
2006-05-04 Merge branch 'js/remoteconfig'
2006-05-04 Merge branch 'maint'
2006-05-04 Merge branch 'fix'
2006-05-03 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-05-02 Merge branch 'fix'
2006-05-02 builtin-diff: call it "git-diff", really.
next