Andrew's git - gitweb.git/history

[gitweb.git] / builtin-merge.c

2008-11-15	Teach/Fix pull/fetch -q/-v options	blob \| diff \| raw
2008-11-14	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-11-13	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-11-13	Merge branch 'jn/gitweb-customlinks'	blob \| diff \| raw \| diff to current
2008-11-13	Merge branch 'jk/maint-commit-v-strip'	blob \| diff \| raw \| diff to current
2008-11-13	Merge branch 'mk/maint-cg-push'	blob \| diff \| raw \| diff to current
2008-11-13	Merge branch 'bc/maint-keep-pack'	blob \| diff \| raw \| diff to current
2008-11-13	Merge branch 'st/tag'	blob \| diff \| raw \| diff to current
2008-11-13	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-11-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-11-12	Merge branch 'jk/maint-commit-v-strip' into jk/commit...	blob \| diff \| raw \| diff to current
2008-11-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-11-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-11-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-11-09	Merge branch 'rs/blame'	blob \| diff \| raw \| diff to current
2008-11-05	Merge branch 'jc/gitweb-fix-cloud-tag'	blob \| diff \| raw \| diff to current
2008-11-05	Merge branch 'mv/maint-branch-m-symref'	blob \| diff \| raw \| diff to current
2008-11-05	Merge branch 'mv/parseopt-checkout-index'	blob \| diff \| raw \| diff to current
2008-11-04	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-11-03	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-11-03	Merge branch 'np/index-pack'	blob \| diff \| raw \| diff to current
2008-11-03	Merge branch 'sh/rebase-i-p'	blob \| diff \| raw \| diff to current
2008-11-03	Merge branch 'cj/maint-gitpm-fix-maybe-self'	blob \| diff \| raw \| diff to current
2008-11-02	Merge branch 'js/maint-fetch-update-head' into maint	blob \| diff \| raw \| diff to current
2008-11-02	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-11-02	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-11-02	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2008-10-31	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-31	Merge branch 'ar/maint-mksnpath' into ar/mksnpath	blob \| diff \| raw \| diff to current
2008-10-27	Merge branch 'ar/maint-mksnpath' into HEAD	blob \| diff \| raw \| diff to current
2008-10-26	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-22	Merge branch 'jk/diff-convfilter'	blob \| diff \| raw \| diff to current
2008-10-22	Merge branch 'js/maint-fetch-update-head'	blob \| diff \| raw \| diff to current
2008-10-22	Merge branch 'jc/maint-co-track'	blob \| diff \| raw \| diff to current
2008-10-22	Merge branch 'rs/alloc-ref'	blob \| diff \| raw \| diff to current
2008-10-22	Merge branch 'jk/fix-ls-files-other'	blob \| diff \| raw \| diff to current
2008-10-21	Merge branch 'jc/maint-reset-remove-unmerged-new'	blob \| diff \| raw \| diff to current
2008-10-21	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-21	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-21	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-10-19	Merge branch 'sh/maint-rebase3'	blob \| diff \| raw \| diff to current
2008-10-19	Merge branch 'tr/workflow-doc'	blob \| diff \| raw \| diff to current
2008-10-19	Merge branch 'mv/clonev'	blob \| diff \| raw \| diff to current
2008-10-19	Merge branch 'ml/cygwin-filemode'	blob \| diff \| raw \| diff to current
2008-10-19	Merge branch 'gb/refactor-pathinfo'	blob \| diff \| raw \| diff to current
2008-10-19	Merge branch 'dp/checkattr'	blob \| diff \| raw \| diff to current
2008-10-19	Merge branch 'gb/formatpatch-autonbr'	blob \| diff \| raw \| diff to current
2008-10-19	Merge branch 'sp/describe-lwtag'	blob \| diff \| raw \| diff to current
2008-10-19	Merge branch 'ae/preservemerge'	blob \| diff \| raw \| diff to current
2008-10-19	Merge branch 'mv/merge-noff'	blob \| diff \| raw \| diff to current
2008-10-19	Merge branch 'ns/rebase-noverify'	blob \| diff \| raw \| diff to current
2008-10-19	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-18	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-18	Merge branch 'db/maint-checkout-b' into maint	blob \| diff \| raw \| diff to current
2008-10-18	Merge branch 'pb/commit-where'	blob \| diff \| raw \| diff to current
2008-10-17	Merge branch 'jk/maint-ls-files-other' into jk/fix...	blob \| diff \| raw \| diff to current
2008-10-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-13	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-12	Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT...	blob \| diff \| raw \| diff to current
2008-10-10	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'js/objc-funchdr'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'pb/gitweb'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'dm/svn-branch'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'bc/xdiffnl'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'dp/cywginstat'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'lt/time-reject-fractional-seconds'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'jc/add-ita'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'mw/sendemail'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'mv/merge-refresh'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'ph/parseopt'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'rz/grepz'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'mg/verboseprune'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'sg/maint-intrebase-msghook' into maint	blob \| diff \| raw \| diff to current
2008-10-09	Merge branch 'jk/maint-soliconv' into maint	blob \| diff \| raw \| diff to current
2008-10-09	builtin-merge.c: allocate correct amount of memory	blob \| diff \| raw \| diff to current
2008-10-08	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-08	Replace xmalloc/memset(0) pairs with xcalloc	blob \| diff \| raw \| diff to current
2008-10-06	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-03	builtin-commit: use reduce_heads() only when appropriate	blob \| diff \| raw \| diff to current
2008-10-03	builtin-merge: refresh the index before calling a strategy	blob \| diff \| raw \| diff to current
2008-10-03	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-01	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-30	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-29	Merge branch 'bc/master-diff-hunk-header-fix'	blob \| diff \| raw \| diff to current
2008-09-29	Merge branch 'maint' into bc/master-diff-hunk-header-fix	blob \| diff \| raw \| diff to current
2008-09-29	Merge branch 'bc/maint-diff-hunk-header-fix' into maint	blob \| diff \| raw \| diff to current
2008-09-29	Merge branch 'jc/better-conflict-resolution'	blob \| diff \| raw \| diff to current
2008-09-29	Merge branch 'mg/maint-remote-fix' into maint	blob \| diff \| raw \| diff to current
2008-09-26	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-25	Merge branch 'mv/merge-recursive'	blob \| diff \| raw \| diff to current
2008-09-25	Merge branch 'jc/alternate-push'	blob \| diff \| raw \| diff to current
2008-09-25	Merge branch 'am/status'	blob \| diff \| raw \| diff to current
2008-09-25	Merge branch 'pb/autocorrect-wrapper'	blob \| diff \| raw \| diff to current
2008-09-25	Merge branch 'mv/commit-tree'	blob \| diff \| raw \| diff to current
2008-09-25	Merge branch 'jc/apply-include-exclude'	blob \| diff \| raw \| diff to current
2008-09-25	Merge branch 'jc/safe-c-l-d'	blob \| diff \| raw \| diff to current
2008-09-25	Merge branch 'ho/dirstat-by-file'	blob \| diff \| raw \| diff to current
2008-09-25	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
next