Andrew's git - gitweb.git/history

[gitweb.git] / builtin-rerere.c

2008-11-02	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw
2008-09-06	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw
2008-08-17	Merge git-gui 0.11.0	blob \| diff \| raw
2008-08-17	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw
2008-08-14	Merge branch 'maint'	blob \| diff \| raw
2008-08-13	Merge branch 'maint'	blob \| diff \| raw
2008-08-12	Merge branch 'maint'	blob \| diff \| raw
2008-08-11	Merge branch 'maint'	blob \| diff \| raw
2008-08-11	Merge branch 'maint'	blob \| diff \| raw
2008-08-09	Merge branch 'maint'	blob \| diff \| raw
2008-08-07	Merge branch 'jc/reflog-expire' into maint	blob \| diff \| raw \| diff to current
2008-08-06	Sync with 1.5.6.5	blob \| diff \| raw
2008-08-06	Merge git://repo.or.cz/git-gui	blob \| diff \| raw
2008-08-06	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw
2008-08-06	Merge branch 'maint'	blob \| diff \| raw
2008-08-03	Merge branch 'maint'	blob \| diff \| raw
2008-08-02	Merge branch 'maint'	blob \| diff \| raw
2008-08-02	Merge branch 'maint'	blob \| diff \| raw
2008-07-30	Merge git://repo.or.cz/git-gui	blob \| diff \| raw
2008-07-27	Merge git://repo.or.cz/git-gui	blob \| diff \| raw
2008-07-25	Merge branch 'maint'	blob \| diff \| raw
2008-07-24	Merge branch 'maint' into ph/checkout	blob \| diff \| raw
2008-07-22	Rename path_list to string_list	blob \| diff \| raw
2008-07-21	Merge branch 'ap/trackinfo' v1.6.0-rc0	blob \| diff \| raw \| diff to current
2008-07-21	Merge branch 'jc/rerere-auto-more'	blob \| diff \| raw \| diff to current
2008-07-21	Merge branch 'ns/am-abort'	blob \| diff \| raw \| diff to current
2008-07-21	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-07-19	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-07-17	Merge branch 'mv/dashless'	blob \| diff \| raw \| diff to current
2008-07-17	Merge branch 'ls/mailinfo'	blob \| diff \| raw \| diff to current
2008-07-17	Merge branch 'sb/dashless'	blob \| diff \| raw \| diff to current
2008-07-17	Merge branch 'rs/archive'	blob \| diff \| raw \| diff to current
2008-07-17	Merge branch 'rs/rebase-checkout-not-so-quiet'	blob \| diff \| raw \| diff to current
2008-07-17	Merge branch 'sp/maint-index-pack'	blob \| diff \| raw \| diff to current
2008-07-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-07-16	Merge branch 'mv/merge-in-c'	blob \| diff \| raw \| diff to current
2008-07-16	Merge branch 'ag/rewrite_one'	blob \| diff \| raw \| diff to current
2008-07-16	Merge branch 'sp/win'	blob \| diff \| raw \| diff to current
2008-07-16	Merge branch 'js/more-win'	blob \| diff \| raw \| diff to current
2008-07-16	Merge branch 'js/maint-pretty-mailmap'	blob \| diff \| raw \| diff to current
2008-07-15	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-07-15	Merge branch 'js/merge-rr'	blob \| diff \| raw \| diff to current
2008-07-15	Merge branch 'sb/rerere-lib'	blob \| diff \| raw \| diff to current
2008-07-15	Merge branch 'ls/maint-mailinfo-patch-label'	blob \| diff \| raw \| diff to current
2008-07-15	Merge branch 'om/rerere-careful'	blob \| diff \| raw \| diff to current
2008-07-15	Merge branch 'jc/branch-merged'	blob \| diff \| raw \| diff to current
2008-07-15	Merge branch 'jc/rebase-orig-head'	blob \| diff \| raw \| diff to current
2008-07-15	Merge branch 'sp/maint-bash-completion-optim'	blob \| diff \| raw \| diff to current
2008-07-13	Merge branch 'sp/maint-bash-completion-optim'	blob \| diff \| raw \| diff to current
2008-07-13	Merge branch 'maint' to sync with 1.5.6.3	blob \| diff \| raw \| diff to current
2008-07-13	Merge branch 'ph/parseopt-step-blame'	blob \| diff \| raw \| diff to current
2008-07-13	Merge branch 'am/stash-branch'	blob \| diff \| raw \| diff to current
2008-07-13	Merge branch 'sg/stash-k-i'	blob \| diff \| raw \| diff to current
2008-07-13	Merge branch 'jc/report-tracking'	blob \| diff \| raw \| diff to current
2008-07-13	Merge branch 'js/pick-root'	blob \| diff \| raw \| diff to current
2008-07-13	Merge branch 'ab/bundle'	blob \| diff \| raw \| diff to current
2008-07-13	Merge branch 'tr/add-i-e'	blob \| diff \| raw \| diff to current
2008-07-13	Make usage strings dash-less	blob \| diff \| raw \| diff to current
2008-07-13	Move MERGE_RR from .git/rr-cache/ into .git/	blob \| diff \| raw \| diff to current
2008-07-10	rerere: Separate libgit and builtin functions	blob \| diff \| raw \| diff to current
2008-07-10	builtin-rerere: more carefully find conflict markers	blob \| diff \| raw \| diff to current
2008-07-09	Merge branch 'jk/pager-config'	blob \| diff \| raw \| diff to current
2008-07-09	Merge branch 'js/apply-root'	blob \| diff \| raw \| diff to current
2008-07-09	Merge branch 'jc/reflog-expire'	blob \| diff \| raw \| diff to current
2008-07-09	Merge branch 'sp/maint-pack-memuse'	blob \| diff \| raw \| diff to current
2008-07-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-07-08	Merge branch 'jc/blame' (early part) into HEAD	blob \| diff \| raw \| diff to current
2008-07-08	Merge branch 'lt/racy-empty' into maint	blob \| diff \| raw \| diff to current
2008-07-07	Merge branch 'qq/maint'	blob \| diff \| raw \| diff to current
2008-07-07	Merge branch 'js/maint-daemon-syslog'	blob \| diff \| raw \| diff to current
2008-07-07	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-07-07	Merge branch 'jc/rerere'	blob \| diff \| raw \| diff to current
2008-07-07	Merge branch 'dr/ceiling'	blob \| diff \| raw \| diff to current
2008-07-06	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-06-27	Merge branch 'maint-1.5.5' into maint	blob \| diff \| raw \| diff to current
2008-06-27	Merge branch 'maint-1.5.4' into maint-1.5.5	blob \| diff \| raw \| diff to current
2008-06-25	Merge branch 'sr/tests'	blob \| diff \| raw \| diff to current
2008-06-25	Merge branch 'lw/perlish'	blob \| diff \| raw \| diff to current
2008-06-25	Merge branch 'jc/maint-combine-diff-pre-context' into...	blob \| diff \| raw \| diff to current
2008-06-22	Merge branch 'rs/archive-ignore'	blob \| diff \| raw \| diff to current
2008-06-22	Merge branch 'lt/racy-empty'	blob \| diff \| raw \| diff to current
2008-06-22	Merge branch 'jc/maint-combine-diff-pre-context'	blob \| diff \| raw \| diff to current
2008-06-22	Merge branch 'jk/test'	blob \| diff \| raw \| diff to current
2008-06-22	Merge branch 'mo/status-untracked'	blob \| diff \| raw \| diff to current
2008-06-22	Merge branch 'kh/update-ref'	blob \| diff \| raw \| diff to current
2008-06-22	Merge branch 'jn/web'	blob \| diff \| raw \| diff to current
2008-06-22	Merge branch 'rg/gitweb'	blob \| diff \| raw \| diff to current
2008-06-22	rerere.autoupdate	blob \| diff \| raw \| diff to current
2008-06-22	rerere: remove dubious "tail_optimization"	blob \| diff \| raw \| diff to current
2008-06-22	git-rerere: detect unparsable conflicts	blob \| diff \| raw \| diff to current
2008-06-22	rerere: rerere_created_at() and has_resolution() abstra...	blob \| diff \| raw \| diff to current
2008-06-17	builtin-rerere: fix a small leak	blob \| diff \| raw \| diff to current
2008-06-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-06-16	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-06-11	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-06-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-06-09	Merge branch 'js/merge-recursive'	blob \| diff \| raw \| diff to current
2008-06-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-06-07	Merge 1.5.5.4 in	blob \| diff \| raw \| diff to current
2008-06-06	Merge branch 'maint'	blob \| diff \| raw \| diff to current
next