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