Andrew's git / gitweb.git / history
?
Add branch --set-upstream
[gitweb.git] / xdiff / xmerge.c
2010-01-17 Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' blob | diff | raw
2010-01-10 Merge branch 'maint-1.6.2' into maint blob | diff | raw
2010-01-10 Merge branch 'maint-1.6.0' into maint-1.6.1 blob | diff | raw | diff to current
2009-12-31 Merge branch 'maint-1.6.0' into maint blob | diff | raw
2009-12-30 Merge branch 'maint-1.6.1' into maint blob | diff | raw
2009-12-30 Merge branch 'maint-1.6.0' into maint-1.6.1 blob | diff | raw | diff to current
2009-12-27 Merge branch 'nf/maint-fix-index-ext-len-on-be64' into... blob | diff | raw
2009-12-09 Merge git://repo.or.cz/git-gui blob | diff | raw
2009-12-09 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2009-12-03 Merge branch 'jc/maint-am-keep' into maint blob | diff | raw
2009-12-03 Merge branch 'np/maint-sideband-favor-status' into... blob | diff | raw
2009-11-30 Merge branch 'jc/maint-am-keep' blob | diff | raw
2009-11-18 Merge branch 'np/maint-sideband-favor-status' blob | diff | raw
2009-11-16 Merge branch 'jk/maint-1.6.3-ls-files-i' into maint blob | diff | raw
2009-11-10 Merge branch 'jk/maint-1.6.3-ls-files-i' blob | diff | raw
2009-10-27 Merge git://repo.or.cz/git-gui blob | diff | raw
2009-10-25 Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached... blob | diff | raw
2009-10-25 Merge branch 'jn/maint-1.6.3-check-ref-format-doc'... blob | diff | raw
2009-10-24 Merge branch 'jn/maint-1.6.3-check-ref-format-doc'... blob | diff | raw
2009-10-19 Merge branch 'jn/maint-1.6.3-check-ref-format-doc' blob | diff | raw
2009-10-19 Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached' blob | diff | raw
2009-10-04 Merge branch 'jc/maint-1.6.4-show-branch-default' into... blob | diff | raw
2009-09-21 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2009-09-16 Merge branch 'tf/diff-whitespace-incomplete-line' into... blob | diff | raw
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc... blob | diff | raw
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part... blob | diff | raw
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part... blob | diff | raw
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part... blob | diff | raw
2009-09-03 Merge branch 'maint-1.6.2' into maint-1.6.3 blob | diff | raw
2009-09-03 Merge branch 'maint-1.6.2' into maint-1.6.3 blob | diff | raw
2009-09-01 Merge branch 'tf/diff-whitespace-incomplete-line' blob | diff | raw
2009-08-28 Merge branch 'maint-1.6.2' into maint-1.6.3 blob | diff | raw
2009-08-28 Merge branch 'maint-1.6.0' into maint-1.6.1 blob | diff | raw | diff to current
2009-08-26 Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into... blob | diff | raw
2009-08-22 Merge branch 'cc/replace' blob | diff | raw
2009-08-21 Merge branch 'jc/maint-merge-recursive-fix' into maint blob | diff | raw
2009-08-19 Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' blob | diff | raw
2009-08-16 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2009-08-11 Merge branch 'jc/maint-merge-recursive-fix' blob | diff | raw
2009-08-08 Merge branch 'maint-1.6.2' into maint-1.6.3 blob | diff | raw
2009-08-08 Merge branch 'maint-1.6.0' into maint-1.6.1 blob | diff | raw | diff to current
2009-07-29 Merge branch 'hv/cvsps-tests' blob | diff | raw
2009-07-06 Merge branch 'gb/am-foreign' blob | diff | raw
2009-07-02 Merge branch 'cc/bisect' blob | diff | raw
2009-07-02 Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory' blob | diff | raw
2009-06-22 Merge branch 'sb/maint-1.6.0-add-config-fix' into maint blob | diff | raw
2009-06-22 Merge branch 'ak/maint-for-each-ref-no-lookup' into... blob | diff | raw
2009-06-22 Merge branch 'rc/maint-http-local-slot-fix' into maint blob | diff | raw
2009-06-22 Merge branch 'cb/maint-no-double-merge' into maint blob | diff | raw
2009-06-22 Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint blob | diff | raw
2009-06-21 Merge branch 'maint-1.6.2' into maint blob | diff | raw
2009-06-21 Merge branch 'maint-1.6.0' into maint-1.6.1 blob | diff | raw | diff to current
2009-06-21 Merge branch 'ph/submodule-rebase' blob | diff | raw
2009-06-21 Merge branch 'jc/cache-tree' blob | diff | raw
2009-06-21 Merge branch 'pb/maint-1.6.2-userdiff-fix' blob | diff | raw
2009-06-21 Merge branch 'sb/maint-1.6.0-add-config-fix' blob | diff | raw
2009-06-20 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2009-06-18 Merge branch 'ak/maint-for-each-ref-no-lookup' blob | diff | raw
2009-06-14 Merge branch 'maint-1.6.2' into maint blob | diff | raw
2009-06-14 Merge branch 'maint-1.6.0' into maint-1.6.1 blob | diff | raw | diff to current
2009-06-13 Merge branch 'rc/http-push' blob | diff | raw
2009-06-13 Merge branch 'cc/bisect' (early part) blob | diff | raw
2009-06-13 Merge branch 'rc/maint-http-local-slot-fix' blob | diff | raw
2009-06-13 Merge branch 'sp/msysgit' blob | diff | raw
2009-06-13 Merge branch 'cb/maint-no-double-merge' blob | diff | raw
2009-06-13 Merge branch 'ph/submodule-rebase' (early part) blob | diff | raw
2009-06-13 Merge branch 'bc/solaris' blob | diff | raw
2009-06-13 Merge branch 'cb/match_refs_internal_tail' blob | diff | raw
2009-06-13 Merge branch 'nw/maint-cvsexportcommit' blob | diff | raw
2009-06-13 Merge branch 'da/araxis-mergetool' blob | diff | raw
2009-06-11 Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into... blob | diff | raw
2009-06-03 Merge branch 'da/pretty-tempname' blob | diff | raw
2009-06-03 Merge branch 'maint' blob | diff | raw
2009-06-02 Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint blob | diff | raw
2009-05-26 Merge branch 'jk/maint-1.6.0-trace-argv' into maint blob | diff | raw | diff to current
2009-05-25 Change xdl_merge to generate output even for null merges blob | diff | raw | diff to current
2009-05-24 Merge branch 'maint-1.6.0' into maint-1.6.1 blob | diff | raw | diff to current
2009-05-23 Merge branch 'jk/maint-1.6.0-trace-argv' blob | diff | raw | diff to current
2009-05-14 Merge branch 'maint-1.6.0' into maint-1.6.1 blob | diff | raw | diff to current
2009-05-09 Merge branch 'maint-1.6.0' into maint-1.6.1 blob | diff | raw | diff to current
2009-05-06 Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maint blob | diff | raw | diff to current
2009-05-06 Merge branch 'maint-1.6.0' into maint blob | diff | raw | diff to current
2009-05-03 Merge branch 'lt/pack-object-memuse' into maint blob | diff | raw | diff to current
2009-05-03 Merge branch 'jc/maint-1.6.0-keep-pack' into maint... blob | diff | raw | diff to current
2009-05-03 Merge branch 'jc/maint-1.6.0-diff-borrow-carefully... blob | diff | raw | diff to current
2009-05-03 Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into... blob | diff | raw | diff to current
2009-05-02 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2009-05-01 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2009-04-29 Merge branch 'maint-1.6.0' into maint-1.6.1 blob | diff | raw | diff to current
2009-04-28 Merge branch 'maint-1.6.0' into maint-1.6.1 blob | diff | raw | diff to current
2009-04-25 Merge branch 'maint-1.6.0' into maint-1.6.1 blob | diff | raw | diff to current
2009-04-18 Merge branch 'lt/pack-object-memuse' blob | diff | raw | diff to current
2009-04-18 Merge branch 'maint-1.6.0' into maint-1.6.1 blob | diff | raw | diff to current
2009-04-18 Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into... blob | diff | raw | diff to current
2009-04-18 Merge branch 'maint-1.6.0' into maint blob | diff | raw | diff to current
2009-04-18 Merge branch 'maint-1.6.0' into maint-1.6.1 blob | diff | raw | diff to current
2009-04-12 Merge branch 'maint-1.6.0' into maint-1.6.1 blob | diff | raw | diff to current
2009-04-09 Merge branch 'jc/maint-1.6.0-diff-borrow-carefully... blob | diff | raw | diff to current
2009-04-09 Merge branch 'maint-1.6.0' into maint-1.6.1 blob | diff | raw | diff to current
2009-04-09 Merge branch 'jc/maint-1.6.0-keep-pack' into maint blob | diff | raw | diff to current
next