xdl_merge(): allow passing down marker_size in xmparam_t
[gitweb.git] / rerere.c
2010-01-17 xdl_merge(): introduce xmparam_t for merge specific...
2010-01-11 rerere forget path: forget recorded resolution
2010-01-11 rerere: refactor rerere logic to make it independent...
2009-12-26 rerere: remove silly 1024-byte line limit
2009-12-09 Merge git://repo.or.cz/git-gui
2009-12-09 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-12-03 Merge branch 'jc/maint-am-keep' into maint
2009-12-03 Merge branch 'np/maint-sideband-favor-status' into...
2009-12-01 Merge branch 'jn/gitweb-blame'
2009-11-30 Merge branch 'jc/mailinfo-remove-brackets'
2009-11-30 Merge branch 'jc/maint-am-keep'
2009-11-21 Merge branch 'jc/fix-tree-walk' (early part)
2009-11-18 Merge branch 'np/maint-sideband-favor-status'
2009-11-16 Merge branch 'jk/maint-1.6.3-ls-files-i' into maint
2009-11-16 Merge branch 'jc/maint-blank-at-eof' into maint
2009-11-16 Merge branch 'jc/maint-1.6.3-graft-trailing-space'...
2009-11-16 Merge branch 'tr/maint-roff-quote' into maint
2009-11-10 Merge branch 'jk/maint-1.6.3-ls-files-i'
2009-10-31 Merge branch 'jc/maint-1.6.3-graft-trailing-space'
2009-10-31 Merge branch 'tr/maint-roff-quote'
2009-10-28 Merge branch 'maint-1.6.4' into maint
2009-10-27 Merge git://repo.or.cz/git-gui
2009-10-25 Merge branch 'maint-1.6.4' into maint
2009-10-25 Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached...
2009-10-25 Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...
2009-10-24 Merge branch 'jp/maint-send-email-fold' into maint
2009-10-24 Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...
2009-10-24 Merge branch 'pv/maint-add-p-no-exclude' into maint
2009-10-19 Merge branch 'jp/maint-send-email-fold'
2009-10-19 Merge branch 'jn/maint-1.6.3-check-ref-format-doc'
2009-10-19 Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached'
2009-10-19 Merge branch 'jn/gitweb-show-size'
2009-10-17 Merge branch 'jc/maint-blank-at-eof'
2009-10-17 Merge branch 'maint-1.6.4' into maint
2009-10-14 Merge branch 'pv/maint-add-p-no-exclude'
2009-10-13 Merge branch 'maint-1.6.4' into maint
2009-10-09 Merge branch 'rs/maint-archive-prefix'
2009-10-09 Merge branch 'maint'
2009-10-08 Merge branch 'maint'
2009-10-04 Merge branch 'maint'
2009-10-04 Merge branch 'jc/maint-1.6.4-show-branch-default' into...
2009-09-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-09-20 Merge branch 'maint'
2009-09-16 Merge 1.6.4.4 in
2009-09-16 Merge branch 'tf/diff-whitespace-incomplete-line' into...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-14 Merge branch 'maint'
2009-09-13 Merge branch 'pk/fast-import-tars'
2009-09-13 Merge branch 'pk/fast-import-dirs'
2009-09-13 Merge branch 'jt/pushinsteadof'
2009-09-13 Merge branch 'jk/unwanted-advices'
2009-09-13 Merge branch 'jc/merge-saner-messages'
2009-09-13 Merge branch 'db/vcs-helper'
2009-09-13 use write_str_in_full helper to avoid literal string...
2009-09-03 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-09-03 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-09-01 Merge branch 'tf/diff-whitespace-incomplete-line'
2009-08-28 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-08-28 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-08-28 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-08-28 Merge branch 'maint-1.5.6' into maint-1.6.0
2009-08-26 Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into...
2009-08-21 Merge branch 'jc/maint-merge-recursive-fix' into maint
2009-08-19 Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix'
2009-08-16 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-08-11 Merge branch 'jc/maint-merge-recursive-fix'
2009-08-08 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-08-08 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-08-08 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-07-29 Merge branch 'hv/cvsps-tests'
2009-07-02 Merge branch 'cc/bisect'
2009-07-02 Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'
2009-06-22 Merge branch 'sb/maint-1.6.0-add-config-fix' into maint
2009-06-22 Merge branch 'rc/maint-http-local-slot-fix' into maint
2009-06-22 Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint
2009-06-21 Merge branch 'maint-1.6.2' into maint
2009-06-21 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-06-21 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-06-21 Merge branch 'ph/submodule-rebase'
2009-06-21 Merge branch 'pb/maint-1.6.2-userdiff-fix'
2009-06-21 Merge branch 'sb/maint-1.6.0-add-config-fix'
2009-06-20 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-06-14 Merge branch 'maint-1.6.2' into maint
2009-06-14 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-06-14 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-06-13 Merge branch 'cc/bisect' (early part)
2009-06-13 Merge branch 'rc/maint-http-local-slot-fix'
2009-06-13 Merge branch 'ph/submodule-rebase' (early part)
2009-06-13 Merge branch 'da/araxis-mergetool'
2009-06-11 Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
2009-06-06 Merge branch 'rc/maint-http-local-slot-fix' into rc...
2009-06-02 Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
2009-06-02 Merge branch 'rs/maint-grep-word-regexp-fix' into maint
2009-06-02 Merge branch 'sb/maint-1.6.2-opt-filename-fix' into...
2009-06-02 Merge branch 'jc/maint-add-p-coalesce-fix' into maint
2009-05-31 Merge branch 'sb/show-branch-parse-options'
2009-05-31 Merge branch 'sb/format-patch-parseopt'
next