projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge branch 'rw/apply-does-not-take-ignore-date' into maint
[git] / builtin / merge-tree.c
2015-01-12  Junio C HamanoMerge branch 'rw/apply-does-not-take-ignore-date' into... blob | commitdiff | raw
2015-01-12  Junio C HamanoMerge branch 'jk/for-each-reflog-ent-reverse' into... blob | commitdiff | raw
2015-01-07  Junio C HamanoMerge branch 'maint-2.1' into maint blob | commitdiff | raw
2014-12-22  Junio C HamanoMerge branch 'jk/rebuild-perl-scripts-with-no-perl... blob | commitdiff | raw
2014-12-22  Junio C HamanoMerge branch 'jk/push-simple' into maint blob | commitdiff | raw
2014-12-22  Junio C HamanoMerge branch 'mh/config-flip-xbit-back-after-checking... blob | commitdiff | raw
2014-12-22  Junio C HamanoMerge branch 'jk/gitweb-with-newer-cgi-multi-param... blob | commitdiff | raw
2014-12-22  Junio C HamanoMerge branch 'rs/receive-pack-use-labs' into maint blob | commitdiff | raw
2014-12-22  Junio C HamanoMerge branch 'rs/maint-config-use-labs' into maint blob | commitdiff | raw
2014-12-22  Junio C HamanoMerge branch 'js/windows-open-eisdir-error' into maint blob | commitdiff | raw
2014-12-22  Junio C HamanoMerge branch 'jk/colors-fix' into maint blob | commitdiff | raw
2014-12-22  Junio C HamanoMerge branch 'jk/checkout-from-tree' into maint blob | commitdiff | raw
2014-12-17  Junio C HamanoSync with v2.1.4 blob | commitdiff | raw
2014-11-19  Junio C HamanoMerge branch 'sv/submitting-final-patch' blob | commitdiff | raw
2014-11-19  Junio C HamanoMerge branch 'sn/tutorial-status-output-example' blob | commitdiff | raw
2014-11-19  Junio C HamanoMerge branch 'mh/doc-remote-helper-xref' blob | commitdiff | raw
2014-11-19  Junio C HamanoMerge branch 'tb/no-relative-file-url' blob | commitdiff | raw
2014-11-19  Junio C HamanoMerge branch 'cc/interpret-trailers' blob | commitdiff | raw
2014-11-18  Junio C HamanoMerge branch 'jc/doc-commit-only' blob | commitdiff | raw
2014-11-18  Junio C HamanoMerge branch 'da/difftool' blob | commitdiff | raw
2014-11-12  Junio C HamanoSync with 'maint' blob | commitdiff | raw
2014-11-12  Junio C HamanoMerge branch 'jk/fetch-reflog-df-conflict' blob | commitdiff | raw
2014-11-11  Junio C HamanoSync with maint blob | commitdiff | raw
2014-11-10  Junio C HamanoSync with maint blob | commitdiff | raw
2014-11-10  Junio C HamanoMerge branch 'js/diff-highlight-avoid-sigpipe' blob | commitdiff | raw
2014-11-06  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2014-11-06  Junio C HamanoMerge branch 'nd/gitignore-trailing-whitespace' blob | commitdiff | raw
2014-11-06  Junio C HamanoMerge branch 'tm/line-log-first-parent' blob | commitdiff | raw
2014-11-06  Junio C HamanoMerge branch 'jk/fetch-reflog-df-conflict' blob | commitdiff | raw
2014-11-06  Junio C HamanoMerge branch 'jk/cache-tree-protect-from-broken-libgit2' blob | commitdiff | raw
2014-10-31  Junio C HamanoMerge branch 'jc/push-cert' blob | commitdiff | raw
2014-10-31  Junio C HamanoMerge branch 'rs/child-process-init' blob | commitdiff | raw
2014-10-31  Junio C HamanoMerge branch 'rs/grep-color-words' blob | commitdiff | raw
2014-10-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw
2014-10-29  Junio C HamanoSync with Git 2.1.3 blob | commitdiff | raw
2014-10-29  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix' into... blob | commitdiff | raw | diff to current
2014-10-29  Junio C HamanoMerge branch 'da/difftool' blob | commitdiff | raw
2014-10-29  Junio C HamanoMerge branch 'rb/pack-window-memory-config-doc' blob | commitdiff | raw
2014-10-29  Junio C HamanoMerge branch 'mg/lib-gpg-ro-safety' blob | commitdiff | raw
2014-10-29  Junio C HamanoMerge branch 'dm/port2zos' blob | commitdiff | raw
2014-10-29  Junio C HamanoMerge branch 'oc/mergetools-beyondcompare' blob | commitdiff | raw
2014-10-24  Junio C HamanoMerge branch 'jc/push-cert' blob | commitdiff | raw
2014-10-24  Junio C HamanoMerge branch 'sb/plug-transport-leak' blob | commitdiff | raw
2014-10-24  Junio C HamanoMerge branch 'nd/dir-prep-exclude-cleanup' blob | commitdiff | raw
2014-10-24  Junio C HamanoMerge branch 'wk/t1304-wo-USER' blob | commitdiff | raw
2014-10-24  Junio C HamanoMerge branch 'tb/core-filemode-doc' blob | commitdiff | raw
2014-10-24  Junio C HamanoMerge branch 'po/doc-status-markup' blob | commitdiff | raw
2014-10-24  Junio C HamanoMerge branch 'jk/pack-objects-no-bitmap-when-splitting' blob | commitdiff | raw
2014-10-21  Junio C HamanoMerge branch 'da/mergetool-meld' blob | commitdiff | raw
2014-10-21  Junio C HamanoMerge branch 'da/mergetool-temporary-directory' blob | commitdiff | raw
2014-10-21  Junio C HamanoMerge branch 'da/mergetool-tool-help' blob | commitdiff | raw
2014-10-21  Junio C HamanoMerge branch 'da/mergetool-temporary-filename' blob | commitdiff | raw
2014-10-21  Junio C HamanoMerge branch 'da/mergetool-tests' blob | commitdiff | raw
2014-10-20  Junio C HamanoMerge branch 'cc/interpret-trailers' blob | commitdiff | raw
2014-10-20  Junio C HamanoMerge branch 'rm/gitweb-start-form' blob | commitdiff | raw
2014-10-20  Junio C HamanoMerge branch 'jn/parse-config-slot' blob | commitdiff | raw
2014-10-20  Junio C HamanoMerge branch 'rs/receive-pack-argv-leak-fix' blob | commitdiff | raw
2014-10-20  Junio C HamanoMerge branch 'ta/config-set' blob | commitdiff | raw
2014-10-16  Junio C HamanoMerge branch 'jc/completion-no-chdir' blob | commitdiff | raw
2014-10-16  Junio C HamanoMerge branch 'bw/trace-no-inline-getnanotime' blob | commitdiff | raw
2014-10-14  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix' blob | commitdiff | raw
2014-10-14  Junio C HamanoMerge branch 'rs/plug-leak-in-bundle' blob | commitdiff | raw
2014-10-14  Junio C HamanoMerge branch 'rs/mailsplit' blob | commitdiff | raw
2014-10-14  Junio C HamanoMerge branch 'rs/sha1-array-test' blob | commitdiff | raw
2014-10-14  Junio C HamanoMerge branch 'sk/tag-contains-wo-recursion' blob | commitdiff | raw
2014-10-14  Junio C HamanoMerge branch 'rs/daemon-fixes' blob | commitdiff | raw
2014-10-14  Junio C HamanoMerge branch 'dt/cache-tree-repair' blob | commitdiff | raw
2014-10-14  Junio C HamanoMerge branch 'so/rebase-doc-fork-point' blob | commitdiff | raw
2014-10-14  Junio C HamanoMerge branch 'da/include-compat-util-first-in-c' blob | commitdiff | raw
2014-10-08  Junio C HamanoMerge branch 'sp/stream-clean-filter' blob | commitdiff | raw
2014-10-08  Junio C HamanoMerge branch 'bw/use-write-script-in-tests' blob | commitdiff | raw
2014-10-08  Junio C HamanoMerge branch 'nd/archive-pathspec' blob | commitdiff | raw
2014-10-08  Junio C HamanoMerge branch 'jc/push-cert' blob | commitdiff | raw
2014-10-07  Junio C HamanoSync with maint blob | commitdiff | raw
2014-09-30  Junio C HamanoSync with 2.1.2 blob | commitdiff | raw
2014-09-30  Junio C HamanoMerge branch 'jt/itimer-autoconf' blob | commitdiff | raw
2014-09-30  Junio C HamanoMerge branch 'jc/test-lazy-prereq' blob | commitdiff | raw
2014-09-30  Junio C HamanoMerge branch 'sb/merge-recursive-copy-paste-fix' blob | commitdiff | raw
2014-09-30  Junio C HamanoMerge branch 'pr/use-default-sigpipe-setting' blob | commitdiff | raw
2014-09-29  Junio C HamanoMerge branch 'jk/mbox-from-line' blob | commitdiff | raw
2014-09-29  Junio C HamanoMerge branch 'sb/t6031-typofix' blob | commitdiff | raw
2014-09-29  Junio C HamanoMerge branch 'sb/t9300-typofix' blob | commitdiff | raw
2014-09-29  Junio C HamanoMerge branch 'da/rev-parse-verify-quiet' blob | commitdiff | raw
2014-09-29  Junio C HamanoMerge branch 'hj/pretty-naked-decoration' blob | commitdiff | raw
2014-09-28  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2014-09-26  Junio C HamanoMerge branch 'sb/help-unknown-command-sort-fix' blob | commitdiff | raw
2014-09-26  Junio C HamanoMerge branch 'jk/branch-verbose-merged' blob | commitdiff | raw
2014-09-26  Junio C HamanoMerge branch 'rs/realloc-array' blob | commitdiff | raw
2014-09-26  Junio C HamanoMerge branch 'jk/close-stderr-of-credential-cache-deamon' blob | commitdiff | raw
2014-09-26  Junio C HamanoMerge branch 'jc/ignore-sigpipe-while-running-hooks' blob | commitdiff | raw
2014-09-26  Junio C HamanoMerge branch 'jk/prune-packed-server-info' blob | commitdiff | raw
2014-09-26  Junio C HamanoMerge branch 'jc/hash-object-fsck-tag' blob | commitdiff | raw
2014-09-26  Junio C HamanoMerge branch 'jc/hash-object' blob | commitdiff | raw
2014-09-26  Junio C HamanoMerge branch 'js/fsck-tag-validation' blob | commitdiff | raw
2014-09-26  Junio C HamanoMerge branch 'jk/faster-name-conflicts' blob | commitdiff | raw
2014-09-26  Junio C HamanoMerge branch 'jk/write-packed-refs-via-stdio' blob | commitdiff | raw
2014-09-19  Junio C HamanoSync with Git 2.1.1 blob | commitdiff | raw
2014-09-19  Junio C HamanoMerge branch 'jk/fsck-exit-code-fix' blob | commitdiff | raw
2014-09-19  Junio C HamanoMerge branch 'so/rebase-doc' blob | commitdiff | raw
2014-09-19  Junio C HamanoMerge branch 'ir/makefile-typofix' blob | commitdiff | raw
next
Unnamed repository; edit this file 'description' to name the repository.