merge-recursive: adjust to loosened "working file clobbered" check
[gitweb.git] / git-pull.sh
2006-10-25 Merge branch 'aw/cvsimport'
2006-10-25 Merge for-each-ref to sync gitweb fully with 'next'
2006-10-25 Merge branch 'jc/web-blame'
2006-10-24 Merge branch 'master' into jc/web
2006-10-23 Merge branch 'np/pack'
2006-10-19 Merge branch 'mw/pathinfo'
2006-10-19 Merge branch 'js/diff'
2006-10-19 Merge branch 'jc/send-email'
2006-10-19 Merge branch 'jc/grep'
2006-10-19 Merge early part of branch 'jc/diff-apply-patch'
2006-10-19 Merge branch 'rs/rebase'
2006-10-19 Merge branch 'sb/fetch'
2006-10-19 Merge branch 'sk/svn'
2006-10-19 Merge branch 'rs/zip'
2006-10-17 Merge branch 'maint'
2006-10-15 Merge branch 'jc/http' v1.4.3-rc3
2006-10-11 git-pull: we say commit X, not X commit.
2006-09-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-13 Merge branch 'jc/upload-pack'
2006-08-13 Merge branch 'th/diff-extra'
2006-08-13 GIT 1.4.2 v1.4.2
2006-08-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-08 Merge branch 'master' into pb/gitpm
2006-07-31 Merge branch 'js/read-tree' into js/c-merge-recursive
2006-07-30 Merge branch 'jn/make'
2006-07-26 Merge branch 'pb/configure'
2006-07-25 Merge branch 'jc/clone-bind-failure'
2006-07-25 Merge branch 'jt/format-patch'
2006-07-25 Merge branch 'ew/apply'
2006-07-25 Merge branch 'jc/read-tree'
2006-07-25 Merge branch 'lt/objformat'
2006-07-17 Merge branch 'sp/reflog' v1.4.2-rc1
2006-07-13 Merge branch 'ml/trace'
2006-07-13 Merge branch 'js/merge-base'
2006-07-13 Merge branch 'lt/prune'
2006-07-13 Merge branch 'lt/merge-tree'
2006-07-11 Log ref changes made by git-merge and git-pull.
2006-07-11 Log ref changes made by git-fetch and git-pull.
2006-07-05 Merge branch 'jc/sha1'
2006-07-05 Merge branch 'jc/diff-test'
2006-07-05 Merge branch 'th/diff'
2006-06-29 Merge branch 'jc/repack'
2006-06-29 Merge branch 'js/patch'
2006-06-27 Fix expr usage for FreeBSD
2006-06-26 Merge branch 'jc/squash'
2006-06-26 Merge branch 'js/diff'
2006-06-24 git-merge --squash
2006-06-24 git-pull: abort when fmt-merge-msg fails.
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-07 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-04 Merge branch 'new' of git://git./gitk/gitk into next
2006-06-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-05-03 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-24 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-07 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-07 Merge branch 'maint'
2006-04-05 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-05 Merge branch 'fix'
2006-04-04 Merge branch 'lt/fix-sol-pack'
2006-04-04 Merge branch 'lt/fix-sol-pack' into next
2006-04-02 Merge branch 'lt/fix-sol-pack' into next
2006-03-31 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-03-26 Merge branches 'jc/clone' and 'jc/name'
2006-03-26 Merge branch 'jc/merge'
2006-03-26 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-03-24 Merge branch 'jc/name' into next
2006-03-24 Merge branch 'jc/cvsimport'
2006-03-24 Merge branch 'jc/pull'
2006-03-24 Merge branch 'jc/fetch'
2006-03-22 Merge branch 'jc/pull' into next
2006-03-22 git-pull: reword "impossible to fast-forward" message.
2006-03-22 git-pull: further safety while on tracking branch.
2006-03-22 Merge branch 'jc/clone' into next
2006-03-21 Merge branch 'jc/clone' into next
2006-03-21 Merge branch 'jc/clone' into next
2006-03-20 Merge branch 'jc/clone' into next
2006-03-18 Merge branch 'master' into next
2006-03-18 git-pull: run repo-config with dash form.
2006-03-18 Merge branch 'jc/empty'
2006-03-16 Merge branch 'master' into next
2006-03-16 Let merge set the default strategy.
2006-02-22 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-02-22 Merge branch 'jc/nostat'
2006-02-13 Merge branch 'jc/nostat'
2006-02-12 Merge branch 'master'
2006-02-12 Merge branch 'pb/repo'
2006-02-12 Merge branch 'jc/fixdiff'
2006-02-12 Avoid using "git-var -l" until it gets fixed.
2006-02-07 Merge git://git.kernel.org/pub/scm/gitk/gitk
2005-12-15 GIT 0.99.9n aka 1.0rc6 v0.99.9nv1.0rc6
2005-12-14 Merge branch 'hold/am'
2005-12-14 Merge branch 'fk/usage'
2005-12-14 Trivial usage string clean-up
2005-12-07 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-29 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-28 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-27 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-26 GIT 0.99.9k v0.99.9k
next