Andrew's git / gitweb.git / history
?
xread/xwrite: clip MAX_IO_SIZE to SSIZE_MAX
[gitweb.git] / builtin / merge.c
2013-06-20 Merge branch 'fc/show-non-empty-errors-in-test' blob | diff | raw
2013-06-20 Merge branch 'fc/makefile' blob | diff | raw
2013-06-20 Merge branch 'js/test-ln-s-add' blob | diff | raw
2013-06-20 Merge branch 'nd/make-wildmatch-default' blob | diff | raw
2013-06-17 Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui blob | diff | raw
2013-06-14 Merge branch 'rr/complete-difftool-fixup' blob | diff | raw
2013-06-14 Merge branch 'mt/send-email-cc-match-fix' blob | diff | raw
2013-06-14 Merge branch 'bp/mediawiki-credential' blob | diff | raw
2013-06-14 Merge branch 'mh/reflife' blob | diff | raw
2013-06-14 Merge branch 'kb/full-history-compute-treesame-carefully-2' blob | diff | raw
2013-06-14 Merge branch 'rr/remove-contrib-some' blob | diff | raw
2013-06-11 Merge branch 'maint' blob | diff | raw
2013-06-11 Merge branch 'maint-1.8.2' into maint blob | diff | raw | diff to current
2013-06-11 Merge branch 'cm/gitweb-project-list-persistent-cgi... blob | diff | raw
2013-06-11 Merge branch 'rr/maint-fetch-tag-doc-asterisks' blob | diff | raw
2013-06-11 Merge branch 'rr/rebase-autostash' blob | diff | raw
2013-06-11 Merge branch 'jk/test-exit-code-by-signal' blob | diff | raw
2013-06-11 Merge branch 'fc/at-head' blob | diff | raw
2013-06-11 Merge branch 'ar/wildmatch-foldcase' blob | diff | raw
2013-06-11 Merge branch 'tr/sha1-file-silence-loose-object-info... blob | diff | raw
2013-06-11 Merge branch 'nd/warn-ambiguous-object-name' blob | diff | raw
2013-06-11 Merge branch 'rr/diffcore-pickaxe-doc' blob | diff | raw
2013-06-11 Merge branch 'cr/git-work-tree-sans-git-dir' blob | diff | raw
2013-06-11 Merge branch 'mm/mediawiki-https-fail-message' blob | diff | raw
2013-06-11 Merge branch 'cb/log-follow-with-combined' blob | diff | raw
2013-06-11 Merge branch 'xq/credential-osxkeychain' blob | diff | raw
2013-06-11 Merge branch 'fc/do-not-use-the-index-in-add-to-index' blob | diff | raw
2013-06-11 Merge branch 'fc/remote-bzr' blob | diff | raw
2013-06-11 Merge branch 'fc/remote-hg' blob | diff | raw
2013-06-11 Merge branch 'rj/mingw-cygwin' blob | diff | raw
2013-06-11 Merge branch 'fc/completion-less-ls-remote' blob | diff | raw
2013-06-11 Merge branch 'tr/test-commit-only-on-orphan' blob | diff | raw
2013-06-11 Merge branch 'rs/unpack-trees-plug-leak' blob | diff | raw
2013-06-11 Merge branch 'rr/die-on-missing-upstream' blob | diff | raw
2013-06-10 Sync with 1.8.3.1 blob | diff | raw
2013-06-10 Merge branch 'jn/config-ignore-inaccessible' into maint blob | diff | raw | diff to current
2013-06-06 Merge branch 'rj/mingw-compat-st-mode-bits' blob | diff | raw
2013-06-06 Merge branch 'sb/archive-zip-double-assignment-fix' blob | diff | raw
2013-06-06 Merge branch 'rr/push-head' blob | diff | raw
2013-06-06 Merge branch 'ks/difftool-dir-diff-copy-fix' blob | diff | raw
2013-06-06 Merge branch 'fc/show-branch-in-rebase-am' blob | diff | raw
2013-06-06 Merge branch 'nd/clone-connectivity-shortcut' blob | diff | raw
2013-06-06 Merge branch 'nd/prune-packed-dryrun-verbose' blob | diff | raw
2013-06-06 Merge branch 'fc/transport-helper-no-refspec' blob | diff | raw
2013-06-05 Merge branch 'rs/commit-m-no-edit' blob | diff | raw
2013-06-05 Merge branch 'fc/send-email-chainreplyto-warning' blob | diff | raw
2013-06-05 Merge branch 'fc/cleanups' blob | diff | raw
2013-06-05 Merge branch 'fc/makefile' blob | diff | raw
2013-06-05 Merge branch 'nd/urls-doc-no-file-hyperlink-fix' blob | diff | raw
2013-06-05 Merge branch 'tr/push-no-verify-doc' blob | diff | raw
2013-06-05 Merge branch 'tg/maint-zsh-svn-remote-prompt' blob | diff | raw
2013-06-05 Merge branch 'th/bisect-skip-report-range-fix' blob | diff | raw
2013-06-05 Merge branch 'dm/unbash-subtree' blob | diff | raw
2013-06-05 Merge branch 'rr/zsh-color-prompt' blob | diff | raw
2013-06-05 Merge branch 'jc/core-checkstat' blob | diff | raw
2013-06-04 Merge branch 'maint' blob | diff | raw
2013-06-03 Sync with maint blob | diff | raw
2013-06-03 Merge branch 'kb/status-ignored-optim-2' blob | diff | raw
2013-06-02 Merge branch 'tr/line-log' blob | diff | raw
2013-06-02 Merge branch 'mc/describe-first-parent' blob | diff | raw
2013-06-02 Merge branch 'rs/tar-tests' blob | diff | raw
2013-06-02 Merge branch 'jc/strbuf-branchname-fix' blob | diff | raw
2013-06-02 Merge branch 'jk/fetch-always-update-tracking' blob | diff | raw
2013-06-02 Merge branch 'tr/coverage' blob | diff | raw
2013-06-02 Merge branch 'mk/combine-diff-context-horizon-fix' blob | diff | raw
2013-06-02 Merge branch 'kb/ancestry-path-threedots' blob | diff | raw
2013-06-02 Merge branch 'jc/t5551-posix-sed-bre' blob | diff | raw
2013-06-02 Merge branch 'da/darwin' blob | diff | raw
2013-06-02 Merge branch 'fc/macos-x-clipped-write' blob | diff | raw
2013-06-02 Merge branch 'vv/help-unknown-ref' blob | diff | raw
2013-06-02 Merge branch 'nd/clone-local-with-colon' blob | diff | raw | diff to current
2013-06-02 Merge branch 'rs/empty-archive' blob | diff | raw | diff to current
2013-06-02 Merge branch 'rh/merge-options-doc-fix' blob | diff | raw | diff to current
2013-06-02 Merge branch 'an/diff-index-doc' blob | diff | raw | diff to current
2013-05-29 Merge branch 'maint-1.8.2' into maint blob | diff | raw | diff to current
2013-05-29 Merge branch 'jn/config-ignore-inaccessible' blob | diff | raw | diff to current
2013-05-29 Merge branch 'jk/lookup-object-prefer-latest' blob | diff | raw | diff to current
2013-05-29 Merge branch 'jk/subtree-do-not-push-if-split-fails' blob | diff | raw | diff to current
2013-05-29 Merge branch 'jk/test-output' blob | diff | raw | diff to current
2013-05-29 Merge branch 'mh/packed-refs-various' blob | diff | raw | diff to current
2013-05-29 Merge branch 'as/check-ignore' blob | diff | raw | diff to current
2013-05-29 Merge branch 'jc/prune-all' blob | diff | raw | diff to current
2013-05-17 Merge branch 'dw/asciidoc-sources-are-dot-txt-files' blob | diff | raw | diff to current
2013-05-17 Merge git://ozlabs.org/~paulus/gitk blob | diff | raw | diff to current
2013-05-13 Merge git://ozlabs.org/~paulus/gitk blob | diff | raw | diff to current
2013-05-09 Sync with v1.8.2.3 blob | diff | raw | diff to current
2013-05-09 Merge branch 'tr/copy-revisions-from-stdin' into maint blob | diff | raw | diff to current
2013-05-08 merge: use help_unknown_ref() blob | diff | raw
2013-05-07 Merge branch 'jk/merge-tree-added-identically' blob | diff | raw | diff to current
2013-05-05 Merge branch 'fc/push-with-export-reporting-result' blob | diff | raw | diff to current
2013-05-03 Merge branch 'tr/unpack-entry-use-after-free-fix' blob | diff | raw | diff to current
2013-05-03 Sync with maint blob | diff | raw | diff to current
2013-05-03 Merge branch 'tr/remote-tighten-commandline-parsing... blob | diff | raw | diff to current
2013-05-03 Merge branch 'jn/glossary-revision' into maint blob | diff | raw | diff to current
2013-05-01 Merge branch 'hb/git-pm-tempfile' blob | diff | raw | diff to current
2013-05-01 Merge branch 'rs/pp-user-info-without-extra-allocation' blob | diff | raw | diff to current
2013-05-01 Merge branch 'tr/remote-tighten-commandline-parsing' blob | diff | raw | diff to current
2013-05-01 Merge branch 'zk/prompt-rebase-step' blob | diff | raw | diff to current
2013-04-29 Merge branch 'maint' blob | diff | raw | diff to current
2013-04-28 Merge branch 'maint' blob | diff | raw | diff to current
next