Andrew's git - gitweb.git/history

[gitweb.git] / rerere.c

2008-11-13	Merge branch 'mk/maint-cg-push'	blob \| diff \| raw
2008-11-13	Merge branch 'bc/maint-keep-pack'	blob \| diff \| raw
2008-11-13	Merge branch 'lt/decorate'	blob \| diff \| raw
2008-11-13	Merge branch 'jk/diff-convfilter'	blob \| diff \| raw
2008-11-13	Merge branch 'jk/diff-convfilter-test-fix'	blob \| diff \| raw
2008-11-13	Merge branch 'st/tag'	blob \| diff \| raw
2008-11-13	Merge git://repo.or.cz/git-gui	blob \| diff \| raw
2008-11-12	Merge branch 'maint'	blob \| diff \| raw
2008-11-12	Merge branch 'jk/maint-commit-v-strip' into jk/commit...	blob \| diff \| raw
2008-11-11	Merge branch 'maint'	blob \| diff \| raw
2008-11-09	Merge branch 'maint'	blob \| diff \| raw
2008-11-09	Merge branch 'maint'	blob \| diff \| raw
2008-11-09	Merge branch 'cb/maint-update-ref-fix' into maint	blob \| diff \| raw \| diff to current
2008-11-09	Merge branch 'cj/maint-gitpm-fix-maybe-self' into maint	blob \| diff \| raw \| diff to current
2008-11-09	Merge branch 'ar/maint-mksnpath' into maint	blob \| diff \| raw \| diff to current
2008-11-09	Merge branch 'mv/maint-branch-m-symref' into maint	blob \| diff \| raw \| diff to current
2008-11-09	Merge branch 'ds/autoconf'	blob \| diff \| raw
2008-11-09	Merge branch 'rs/blame'	blob \| diff \| raw
2008-11-05	Merge branch 'ar/mksnpath'	blob \| diff \| raw
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 'ag/blame-encoding'	blob \| diff \| raw \| diff to current
2008-11-03	Merge branch 'gb/gitweb-pathinfo'	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 'jk/maint-ls-files-other' into maint	blob \| diff \| raw \| diff to current
2008-11-02	Merge branch 'jc/maint-reset-remove-unmerged-new' into...	blob \| diff \| raw \| diff to current
2008-11-02	Merge branch 'jc/maint-co-track' 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
2008-10-31	Use git_pathdup instead of xstrdup(git_path(...))	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-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 '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-19	Enhance hold_lock_file_for_{update,append}() API	blob \| diff \| raw \| diff to current
2008-10-18	Merge branch '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 '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 '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-08	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-06	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-03	Merge branch 'pb/gitweb-tagcloud' into pb/gitweb	blob \| diff \| raw \| diff to current
2008-10-03	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-03	fix openssl headers conflicting with custom SHA1 implem...	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 'jc/better-conflict-resolution'	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 git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-09-09	is_directory(): a generic helper function	blob \| diff \| raw \| diff to current
2008-09-07	Merge updated git-gui and gitk that call each other	blob \| diff \| raw \| diff to current
2008-09-06	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2008-08-31	Merge branch 'jc/maint-checkout-fix' into 'jc/better...	blob \| diff \| raw \| diff to current
2008-08-31	rerere: understand "diff3 -m" style conflicts with...	blob \| diff \| raw \| diff to current
2008-08-31	rerere.c: use symbolic constants to keep track of parsi...	blob \| diff \| raw \| diff to current
2008-08-20	Merge branch 'ph/enable-threaded'	blob \| diff \| raw \| diff to current
2008-08-17	Merge git-gui 0.11.0	blob \| diff \| raw \| diff to current
2008-08-17	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-08-14	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-13	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-06	Sync with 1.5.6.5	blob \| diff \| raw \| diff to current
next