Merge branch 'ah/fix-http-push' into maint
[gitweb.git] / builtin / rerere.c
2014-07-22 Merge branch 'ah/fix-http-push' into maint
2014-07-22 Merge branch 'po/error-message-style' into maint
2014-07-22 Merge branch 'zk/log-graph-showsig' into maint
2014-07-22 Merge branch 'mg/fix-log-mergetag-color' into maint
2014-07-22 Merge branch 'ye/doc-http-proto' into maint
2014-07-22 Merge branch 'jm/api-strbuf-doc' into maint
2014-07-22 Merge branch 'jm/dedup-test-config' into maint
2014-07-22 Merge branch 'sk/test-cmp-bin' into maint
2014-07-22 Merge branch 'jm/doc-wording-tweaks' into maint
2014-07-22 Merge branch 'jm/instaweb-apache-24' into maint
2014-07-22 Merge branch 'bg/xcalloc-nmemb-then-size' into maint
2014-07-22 Merge branch 'cb/byte-order' into maint
2014-07-22 Merge branch 'lt/request-pull' into maint
2014-07-22 Merge branch 'ep/shell-assign-and-export-vars' into...
2014-07-22 Merge branch 'maint-1.9' into maint
2014-07-16 Merge branch 'jc/fix-clone-single-starting-at-a-tag...
2014-07-16 Merge branch 'jk/pretty-G-format-fixes' into maint
2014-07-16 Merge branch 'rs/fix-alt-odb-path-comparison' into...
2014-07-16 Merge branch 'jk/commit-buffer-length' into maint
2014-07-16 Merge branch 'bc/fix-rebase-merge-skip' into maint
2014-07-16 Merge branch 'maint-1.9' into maint
2014-07-10 Merge branch 'pb/trim-trailing-spaces' into maint
2014-07-10 Merge branch 'jk/repack-pack-keep-objects' into maint
2014-07-10 Merge branch 'mc/doc-submodule-sync-recurse' into maint
2014-07-02 Merge branch 'maint-1.8.5' into maint
2014-06-25 Merge branch 'na/no-http-test-in-the-middle' into maint
2014-06-25 Merge branch 'jl/status-added-submodule-is-never-ignore...
2014-06-25 Merge branch 'ym/fix-opportunistic-index-update-race...
2014-06-25 Merge branch 'mk/show-s-no-extra-blank-line-for-merges...
2014-06-25 Merge branch 'rr/rebase-autostash-fix' into maint
2014-06-25 Merge branch 'jc/shortlog-ref-exclude' into maint
2014-06-25 Merge branch 'jl/remote-rm-prune' into maint
2014-06-25 Merge branch 'fc/rerere-conflict-style' into maint
2014-05-19 Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-05-08 Merge branch 'cl/p4-use-diff-tree' into maint
2014-05-07 Merge branch 'cl/p4-use-diff-tree'
2014-04-30 rerere: fix for merge.conflictstyle
2014-04-09 Merge branch 'jk/commit-dates-parsing-fix' into maint
2014-04-09 Merge commit 'doc/http-backend: missing accent grave...
2014-04-08 Merge branch 'jk/commit-dates-parsing-fix'
2014-04-03 Merge branch 'mh/remove-subtree-long-pathname-fix'...
2014-04-03 Merge branch 'jc/stash-pop-not-popped' into maint
2014-03-31 Merge branch 'wt/doc-submodule-name-path-confusion-1'
2014-03-31 Merge branch 'dw/doc-status-no-longer-shows-pound-prefix'
2014-03-25 Merge branch 'dm/configure-iconv-locale-charset'
2014-03-25 Merge branch 'mh/remove-subtree-long-pathname-fix'
2014-03-25 Merge branch 'cp/am-patch-format-doc'
2014-03-21 Merge branch 'es/sh-i18n-envsubst'
2014-03-21 Merge branch 'jc/stash-pop-not-popped'
2014-03-18 Merge branch 'jk/commit-dates-parsing-fix' into maint
2014-03-18 Merge branch 'tr/diff-submodule-no-reuse-worktree'...
2014-03-18 Merge branch 'jc/check-attr-honor-working-tree' into...
2014-03-18 Merge branch 'bk/refresh-missing-ok-in-merge-recursive...
2014-03-18 Merge branch 'jk/config-path-include-fix' into maint
2014-03-18 Merge branch 'nd/diff-quiet-stat-dirty' into maint
2014-03-18 Merge branch 'mh/simplify-cache-tree-find'
2014-03-18 Merge branch 'jn/branch-lift-unnecessary-name-length...
2014-03-18 Merge branch 'nd/sha1-file-delta-stack-leakage-fix'
2014-03-14 Merge branch 'sh/write-pack-file-warning-message-fix'
2014-03-14 Merge branch 'jk/commit-dates-parsing-fix'
2014-03-14 Merge branch 'jh/note-trees-record-blobs'
2014-03-14 Merge branch 'tr/diff-submodule-no-reuse-worktree'
2014-03-14 Merge branch 'jc/check-attr-honor-working-tree'
2014-03-07 Merge branch 'jc/hold-diff-remove-q-synonym-for-no...
2014-03-07 Merge branch 'jc/core-checkstat-2.0'
2014-03-07 Merge branch 'jc/add-2.0-ignore-removal'
2014-03-07 Merge branch 'jn/add-2.0-u-A-sans-pathspec'
2014-03-07 Merge branch 'jc/push-2.0-default-to-simple'
2014-03-03 Merge branch 'sh/write-pack-file-warning-message-fix...
2014-02-27 Merge branch 'nd/test-rename-reset'
2014-02-27 Merge branch 'bs/stdio-undef-before-redef'
2014-02-27 Merge branch 'jk/config-path-include-fix'
2014-02-27 Merge branch 'nd/diff-quiet-stat-dirty'
2014-02-27 Merge branch 'bk/refresh-missing-ok-in-merge-recursive'
2014-02-13 Merge branch 'bm/merge-base-octopus-dedup' into maint
2014-02-13 Merge branch 'jc/revision-range-unpeel' into maint
2014-02-13 Merge branch 'jk/allow-fetch-onelevel-refname' into...
2014-02-13 Merge branch 'sb/repack-in-c' into maint
2014-02-13 Merge branch 'as/tree-walk-fix-aggressive-short-cut...
2014-02-07 Merge branch 'aj/ada-diff-word-pattern'
2014-02-07 Merge branch 'nd/tag-doc'
2014-02-05 Merge branch 'jc/maint-pull-docfix' into maint
2014-02-05 Merge branch 'bc/log-decoration' into maint
2014-02-05 Merge branch 'tr/send-email-ssl' into maint
2014-02-05 Merge branch 'nd/transport-positive-depth-only' into...
2014-02-05 Merge branch 'tb/repack-fix-renames' (early part)
2014-01-27 Merge branch 'as/tree-walk-fix-aggressive-short-cut'
2014-01-27 Merge branch 'jk/revision-o-is-in-libgit-a'
2014-01-27 Merge branch 'sb/repack-in-c'
2014-01-27 Merge branch 'jk/mark-edges-uninteresting'
2014-01-27 Merge branch 'jk/allow-fetch-onelevel-refname'
2014-01-27 Merge branch 'jc/revision-range-unpeel'
2014-01-27 Merge branch 'mh/attr-macro-doc'
2014-01-27 Merge branch 'jc/maint-pull-docfix'
2014-01-23 Merge git://ozlabs.org/~paulus/gitk
2014-01-21 Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
2014-01-14 Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...
2014-01-13 Merge branch 'jk/t5531-prepare-to-default-to-non-matching'
2014-01-13 Merge branch 'nd/daemon-informative-errors-typofix...
2014-01-10 Merge branch 'bm/merge-base-octopus-dedup'
next