Andrew's git - gitweb.git/history

[gitweb.git] / git-pull.sh

2007-01-05	Merge branch 'maint'	blob \| diff \| raw
2007-01-01	Merge branch 'sp/merge' (early part)	blob \| diff \| raw
2007-01-01	fail pull/merge early in the middle of conflicted merge	blob \| diff \| raw
2006-12-29	Merge branch 'jc/curl'	blob \| diff \| raw \| diff to current
2006-12-29	Merge branch 'jc/utf8'	blob \| diff \| raw \| diff to current
2006-12-29	Merge branch 'jc/make'	blob \| diff \| raw \| diff to current
2006-12-28	Merge branch 'js/shallow'	blob \| diff \| raw \| diff to current
2006-12-28	Allow git-merge to select the default strategy.	blob \| diff \| raw \| diff to current
2006-12-28	Ensure `git-pull` fails if `git-merge` fails.	blob \| diff \| raw \| diff to current
2006-12-28	Use GIT_REFLOG_ACTION environment variable instead.	blob \| diff \| raw \| diff to current
2006-12-27	Merge branch 'master' into js/shallow	blob \| diff \| raw \| diff to current
2006-12-25	Merge branch 'jc/skip-count'	blob \| diff \| raw \| diff to current
2006-12-25	Merge branch 'jc/git-add--interactive'	blob \| diff \| raw \| diff to current
2006-12-22	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-12-21	Merge branch 'ew/svn-pm'	blob \| diff \| raw \| diff to current
2006-12-20	Merge branch 'jc/leftright'	blob \| diff \| raw \| diff to current
2006-12-20	Merge branch 'jc/blame'	blob \| diff \| raw \| diff to current
2006-12-20	Merge branch 'jc/branch-remove-remote'	blob \| diff \| raw \| diff to current
2006-12-20	Merge branch 'jc/clone'	blob \| diff \| raw \| diff to current
2006-12-19	Move "no merge candidate" warning into git-pull	blob \| diff \| raw \| diff to current
2006-11-29	Merge master.kernel.org:/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-11-24	Merge branch 'jc/numstat'	blob \| diff \| raw \| diff to current
2006-11-24	Merge branch 'jc/upload-pack'	blob \| diff \| raw \| diff to current
2006-11-17	git-pull: allow pulling into an empty repository	blob \| diff \| raw \| diff to current
2006-11-08	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-11-01	Merge branch 'jc/refs-and-fetch'	blob \| diff \| raw \| diff to current
2006-11-01	Merge branch 'lj/refs'	blob \| diff \| raw \| diff to current
2006-10-25	Merge branch 'aw/cvsimport'	blob \| diff \| raw \| diff to current
2006-10-25	Merge for-each-ref to sync gitweb fully with 'next'	blob \| diff \| raw \| diff to current
2006-10-25	Merge branch 'jc/web-blame'	blob \| diff \| raw \| diff to current
2006-10-24	Merge branch 'master' into jc/web	blob \| diff \| raw \| diff to current
2006-10-23	Merge branch 'np/pack'	blob \| diff \| raw \| diff to current
2006-10-19	Merge branch 'mw/pathinfo'	blob \| diff \| raw \| diff to current
2006-10-19	Merge branch 'js/diff'	blob \| diff \| raw \| diff to current
2006-10-19	Merge branch 'jc/send-email'	blob \| diff \| raw \| diff to current
2006-10-19	Merge branch 'jc/grep'	blob \| diff \| raw \| diff to current
2006-10-19	Merge early part of branch 'jc/diff-apply-patch'	blob \| diff \| raw \| diff to current
2006-10-19	Merge branch 'rs/rebase'	blob \| diff \| raw \| diff to current
2006-10-19	Merge branch 'sb/fetch'	blob \| diff \| raw \| diff to current
2006-10-19	Merge branch 'sk/svn'	blob \| diff \| raw \| diff to current
2006-10-19	Merge branch 'rs/zip'	blob \| diff \| raw \| diff to current
2006-10-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-10-15	Merge branch 'jc/http' v1.4.3-rc3	blob \| diff \| raw \| diff to current
2006-10-11	git-pull: we say commit X, not X commit.	blob \| diff \| raw \| diff to current
2006-09-01	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-08-13	Merge branch 'jc/upload-pack'	blob \| diff \| raw \| diff to current
2006-08-13	Merge branch 'th/diff-extra'	blob \| diff \| raw \| diff to current
2006-08-13	GIT 1.4.2 v1.4.2	blob \| diff \| raw \| diff to current
2006-08-13	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-08-08	Merge branch 'master' into pb/gitpm	blob \| diff \| raw \| diff to current
2006-07-31	Merge branch 'js/read-tree' into js/c-merge-recursive	blob \| diff \| raw \| diff to current
2006-07-30	Merge branch 'jn/make'	blob \| diff \| raw \| diff to current
2006-07-26	Merge branch 'pb/configure'	blob \| diff \| raw \| diff to current
2006-07-25	Merge branch 'jc/clone-bind-failure'	blob \| diff \| raw \| diff to current
2006-07-25	Merge branch 'jt/format-patch'	blob \| diff \| raw \| diff to current
2006-07-25	Merge branch 'ew/apply'	blob \| diff \| raw \| diff to current
2006-07-25	Merge branch 'jc/read-tree'	blob \| diff \| raw \| diff to current
2006-07-25	Merge branch 'lt/objformat'	blob \| diff \| raw \| diff to current
2006-07-17	Merge branch 'sp/reflog' v1.4.2-rc1	blob \| diff \| raw \| diff to current
2006-07-13	Merge branch 'ml/trace'	blob \| diff \| raw \| diff to current
2006-07-13	Merge branch 'js/merge-base'	blob \| diff \| raw \| diff to current
2006-07-13	Merge branch 'lt/prune'	blob \| diff \| raw \| diff to current
2006-07-13	Merge branch 'lt/merge-tree'	blob \| diff \| raw \| diff to current
2006-07-11	Log ref changes made by git-merge and git-pull.	blob \| diff \| raw \| diff to current
2006-07-11	Log ref changes made by git-fetch and git-pull.	blob \| diff \| raw \| diff to current
2006-07-05	Merge branch 'jc/sha1'	blob \| diff \| raw \| diff to current
2006-07-05	Merge branch 'jc/diff-test'	blob \| diff \| raw \| diff to current
2006-07-05	Merge branch 'th/diff'	blob \| diff \| raw \| diff to current
2006-06-29	Merge branch 'jc/repack'	blob \| diff \| raw \| diff to current
2006-06-29	Merge branch 'js/patch'	blob \| diff \| raw \| diff to current
2006-06-27	Fix expr usage for FreeBSD	blob \| diff \| raw \| diff to current
2006-06-26	Merge branch 'jc/squash'	blob \| diff \| raw \| diff to current
2006-06-26	Merge branch 'js/diff'	blob \| diff \| raw \| diff to current
2006-06-24	git-merge --squash	blob \| diff \| raw \| diff to current
2006-06-24	git-pull: abort when fmt-merge-msg fails.	blob \| diff \| raw \| diff to current
2006-06-13	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-06-10	Merge git://git.kernel.org/pub/scm/git/gitweb	blob \| diff \| raw \| diff to current
2006-06-07	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-06-04	Merge branch 'new' of git://git./gitk/gitk into next	blob \| diff \| raw \| diff to current
2006-06-01	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-05-03	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-04-24	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-04-17	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-04-07	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-04-07	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-04-05	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-04-05	Merge branch 'fix'	blob \| diff \| raw \| diff to current
2006-04-04	Merge branch 'lt/fix-sol-pack'	blob \| diff \| raw \| diff to current
2006-04-04	Merge branch 'lt/fix-sol-pack' into next	blob \| diff \| raw \| diff to current
2006-04-02	Merge branch 'lt/fix-sol-pack' into next	blob \| diff \| raw \| diff to current
2006-03-31	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-03-26	Merge branches 'jc/clone' and 'jc/name'	blob \| diff \| raw \| diff to current
2006-03-26	Merge branch 'jc/merge'	blob \| diff \| raw \| diff to current
2006-03-26	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-03-24	Merge branch 'jc/name' into next	blob \| diff \| raw \| diff to current
2006-03-24	Merge branch 'jc/cvsimport'	blob \| diff \| raw \| diff to current
2006-03-24	Merge branch 'jc/pull'	blob \| diff \| raw \| diff to current
2006-03-24	Merge branch 'jc/fetch'	blob \| diff \| raw \| diff to current
2006-03-22	Merge branch 'jc/pull' into next	blob \| diff \| raw \| diff to current
2006-03-22	git-pull: reword "impossible to fast-forward" message.	blob \| diff \| raw \| diff to current
next