projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
merge: refuse to create too cool a merge by default
[git] / sequencer.c
2016-03-17  Junio C HamanoSync with Git 2.6.6 blob | commitdiff | raw
2016-03-17  Junio C HamanoMerge branch 'maint-2.5' into maint-2.6 blob | commitdiff | raw | diff to current
2016-03-16  Junio C HamanoMerge branch 'jk/path-name-safety-2.6' into jk/path... blob | commitdiff | raw
2016-03-16  Junio C HamanoMerge branch 'jk/path-name-safety-2.5' into jk/path... blob | commitdiff | raw | diff to current
2016-03-10  Junio C HamanoMerge branch 'ma/update-hooks-sample-typofix' into... blob | commitdiff | raw
2016-03-10  Junio C HamanoMerge branch 'dt/initial-ref-xn-commit-doc' into maint blob | commitdiff | raw
2016-03-10  Junio C HamanoMerge branch 'ps/plug-xdl-merge-leak' into maint blob | commitdiff | raw
2016-03-10  Junio C HamanoMerge branch 'ak/git-strip-extension-from-dashed-comman... blob | commitdiff | raw
2016-03-10  Junio C HamanoMerge branch 'ak/extract-argv0-last-dir-sep' into maint blob | commitdiff | raw
2016-03-10  Junio C HamanoMerge branch 'jk/pack-idx-corruption-safety' into maint blob | commitdiff | raw
2016-03-10  Junio C HamanoMerge branch 'js/config-set-in-non-repository' into... blob | commitdiff | raw
2016-03-10  Junio C HamanoMerge branch 'sb/submodule-module-list-fix' into maint blob | commitdiff | raw
2016-03-10  Junio C HamanoMerge branch 'jk/grep-binary-workaround-in-test' into... blob | commitdiff | raw
2016-03-10  Junio C HamanoMerge branch 'mm/push-simple-doc' into maint blob | commitdiff | raw
2016-03-10  Junio C HamanoMerge branch 'jk/tighten-alloc' into maint blob | commitdiff | raw
2016-03-10  Junio C HamanoMerge branch 'jk/more-comments-on-textconv' into maint blob | commitdiff | raw | diff to current
2016-03-10  Junio C HamanoMerge branch 'jk/no-diff-emit-common' into maint blob | commitdiff | raw | diff to current
2016-03-10  Junio C HamanoMerge branch 'jc/am-i-v-fix' into maint blob | commitdiff | raw | diff to current
2016-03-10  Junio C HamanoMerge branch 'nd/dwim-wildcards-as-pathspecs' into... blob | commitdiff | raw | diff to current
2016-03-10  Junio C HamanoMerge branch 'mg/work-tree-tests' into maint blob | commitdiff | raw | diff to current
2016-02-22  Jeff Kingsequencer: simplify memory allocation of get_message blob | commitdiff | raw
2016-02-22  Junio C HamanoMerge branch 'nd/ita-cleanup' into maint blob | commitdiff | raw | diff to current
2016-02-22  Patrick Steinhardtconfig: rename git_config_set_or_die to git_config_set blob | commitdiff | raw | diff to current
2016-02-22  Patrick Steinhardtsequencer: die on config error when saving replay opts blob | commitdiff | raw | diff to current
2016-02-17  Junio C HamanoMerge branch 'nd/do-not-move-worktree-manually' into... blob | commitdiff | raw | diff to current
2016-02-17  Junio C HamanoMerge branch 'js/xmerge-marker-eol' into maint blob | commitdiff | raw | diff to current
2016-02-05  Junio C HamanoMerge branch 'lv/add-doc-working-tree' into maint blob | commitdiff | raw | diff to current
2016-02-05  Junio C HamanoMerge branch 'ss/clone-depth-single-doc' into maint blob | commitdiff | raw | diff to current
2016-02-05  Junio C HamanoMerge branch 'sg/t6050-failing-editor-test-fix' into... blob | commitdiff | raw | diff to current
2016-02-05  Junio C HamanoMerge branch 'ew/for-each-ref-doc' into maint blob | commitdiff | raw | diff to current
2016-02-05  Junio C HamanoMerge branch 'ss/user-manual' into maint blob | commitdiff | raw | diff to current
2016-02-05  Junio C HamanoMerge branch 'js/dirname-basename' into maint blob | commitdiff | raw | diff to current
2016-02-05  Junio C HamanoMerge branch 'tb/complete-word-diff-regex' into maint blob | commitdiff | raw | diff to current
2016-02-05  Junio C HamanoMerge branch 'nd/diff-with-path-params' into maint blob | commitdiff | raw | diff to current
2016-02-05  Junio C HamanoMerge branch 'dw/subtree-split-do-not-drop-merge' into... blob | commitdiff | raw | diff to current
2016-02-05  Junio C HamanoMerge branch 'ew/svn-1.9.0-auth' into maint blob | commitdiff | raw | diff to current
2016-02-05  Junio C HamanoMerge branch 'jk/sanity' into maint blob | commitdiff | raw | diff to current
2016-02-05  Junio C HamanoMerge branch 'jk/filter-branch-no-index' into maint blob | commitdiff | raw | diff to current
2016-02-05  Junio C HamanoMerge branch 'jk/ok-to-fail-gc-auto-in-rebase' into... blob | commitdiff | raw | diff to current
2016-02-05  Junio C HamanoMerge branch 'ho/gitweb-squelch-undef-warning' into... blob | commitdiff | raw | diff to current
2016-02-05  Junio C HamanoMerge branch 'js/fopen-harder' into maint blob | commitdiff | raw | diff to current
2016-02-05  Junio C HamanoMerge branch 'nd/exclusion-regression-fix' into maint blob | commitdiff | raw | diff to current
2016-02-05  Junio C HamanoMerge branch 'dk/reflog-walk-with-non-commit' into... blob | commitdiff | raw | diff to current
2016-02-05  Junio C HamanoMerge branch 'dw/signoff-doc' into maint blob | commitdiff | raw | diff to current
2016-02-05  Junio C HamanoMerge branch 'jk/clang-pedantic' into maint blob | commitdiff | raw | diff to current
2016-02-05  Junio C HamanoMerge branch 'ew/send-email-mutt-alias-fix' into maint blob | commitdiff | raw | diff to current
2016-02-05  Junio C HamanoMerge branch 'nd/dir-exclude-cleanup' into maint blob | commitdiff | raw | diff to current
2016-02-05  Junio C HamanoMerge branch 'nd/stop-setenv-work-tree' into maint blob | commitdiff | raw | diff to current
2016-01-04  Junio C HamanoSync with 2.6.5 blob | commitdiff | raw | diff to current
2016-01-04  Junio C HamanoMerge branch 'jk/pending-keep-tag-name' into maint blob | commitdiff | raw | diff to current
2016-01-04  Junio C HamanoMerge branch 'jk/symbolic-ref-maint' into maint blob | commitdiff | raw | diff to current
2016-01-04  Junio C HamanoMerge branch 'sg/completion-no-column' into maint blob | commitdiff | raw | diff to current
2015-12-28  Junio C HamanoMerge branch 'jk/pending-keep-tag-name' blob | commitdiff | raw | diff to current
2015-12-28  Junio C HamanoMerge branch 'jk/symbolic-ref-maint' blob | commitdiff | raw | diff to current
2015-12-22  Junio C HamanoMerge branch 'js/emu-write-epipe-on-windows' blob | commitdiff | raw | diff to current
2015-12-21  Junio C HamanoMerge branch 'jk/ident-loosen-getpwuid' blob | commitdiff | raw | diff to current
2015-12-21  Junio C HamanoMerge branch 'jk/send-email-ssl-errors' blob | commitdiff | raw | diff to current
2015-12-21  Junio C HamanoMerge branch 'sg/completion-no-column' blob | commitdiff | raw | diff to current
2015-12-21  Junio C HamanoMerge branch 'mc/push-recurse-submodules-config' blob | commitdiff | raw | diff to current
2015-12-21  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2015-12-16  Junio C HamanoMerge branch 'fr/rebase-i-continue-preserve-options' blob | commitdiff | raw | diff to current
2015-12-16  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2015-12-15  Junio C HamanoSync with maint blob | commitdiff | raw | diff to current
2015-12-15  Junio C HamanoMerge branch 'ls/p4-keep-empty-commits' into maint blob | commitdiff | raw | diff to current
2015-12-15  Junio C HamanoMerge branch 'jk/send-email-complete-aliases' blob | commitdiff | raw | diff to current
2015-12-15  Junio C HamanoMerge branch 'ep/ident-with-getaddrinfo' blob | commitdiff | raw | diff to current
2015-12-15  Junio C HamanoMerge branch 'jk/prune-mtime' into maint blob | commitdiff | raw | diff to current
2015-12-15  Junio C HamanoMerge branch 'ls/p4-keep-empty-commits' blob | commitdiff | raw | diff to current
2015-12-15  Junio C HamanoMerge branch 'jk/prune-mtime' blob | commitdiff | raw | diff to current
2015-12-11  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2015-12-11  Junio C HamanoMerge branch 'sn/null-pointer-arith-in-mark-tree-uninte... blob | commitdiff | raw | diff to current
2015-12-11  Junio C HamanoMerge branch 'cb/t3404-shellquote' into maint blob | commitdiff | raw | diff to current
2015-12-11  Junio C HamanoMerge branch 'sb/doc-submodule-sync-recursive' into... blob | commitdiff | raw | diff to current
2015-12-11  Junio C HamanoMerge branch 'nd/doc-check-ref-format-typo' into maint blob | commitdiff | raw | diff to current
2015-12-11  Junio C HamanoMerge branch 'rs/show-branch-argv-array' into maint blob | commitdiff | raw | diff to current
2015-12-11  Junio C HamanoMerge branch 'rs/pop-commit' into maint blob | commitdiff | raw | diff to current
2015-12-11  Junio C HamanoMerge branch 'jk/test-lint-forbid-when-finished-in... blob | commitdiff | raw | diff to current
2015-12-11  Junio C HamanoMerge branch 'sn/null-pointer-arith-in-mark-tree-uninte... blob | commitdiff | raw | diff to current
2015-12-11  Junio C HamanoMerge branch 'sb/doc-submodule-sync-recursive' blob | commitdiff | raw | diff to current
2015-12-11  Junio C HamanoMerge branch 'cb/t3404-shellquote' blob | commitdiff | raw | diff to current
2015-12-11  Junio C HamanoMerge branch 'sg/lock-file-commit-error' blob | commitdiff | raw | diff to current
2015-12-11  Jiang XinMerge branch 'master' of git://github.com/git-l10n... blob | commitdiff | raw | diff to current
2015-12-10  Junio C HamanoSync with maint blob | commitdiff | raw | diff to current
2015-12-10  Junio C HamanoMerge branch 'nd/doc-check-ref-format-typo' blob | commitdiff | raw | diff to current
2015-12-10  Junio C HamanoMerge branch 'bc/object-id' blob | commitdiff | raw | diff to current
2015-12-08  Junio C HamanoMerge branch 'ad/sha1-update-chunked' into maint blob | commitdiff | raw | diff to current
2015-12-08  Junio C HamanoMerge branch 'jk/rebase-no-autostash' into maint blob | commitdiff | raw | diff to current
2015-12-04  Junio C HamanoMerge branch 'da/difftool' into maint blob | commitdiff | raw | diff to current
2015-12-04  Junio C HamanoMerge branch 'dk/gc-idx-wo-pack' into maint blob | commitdiff | raw | diff to current
2015-12-04  Junio C HamanoMerge branch 'ad/sha1-update-chunked' blob | commitdiff | raw | diff to current
2015-12-01  Jeff KingMerge branch 'mk/blame-first-parent' blob | commitdiff | raw | diff to current
2015-12-01  Jeff KingMerge branch 'pt/http-socks-proxy' into maint blob | commitdiff | raw | diff to current
2015-12-01  Jeff KingMerge branch 'rc/configure-use-libs-when-checking-a... blob | commitdiff | raw | diff to current
2015-11-25  Jeff KingMerge branch 'rc/configure-use-libs-when-checking-a... blob | commitdiff | raw | diff to current
2015-11-20  brian m. carlsonRemove get_object_hash. blob | commitdiff | raw | diff to current
2015-11-20  brian m. carlsonConvert struct object to object_id blob | commitdiff | raw | diff to current
2015-11-20  brian m. carlsonAdd several uses of get_object_hash. blob | commitdiff | raw | diff to current
2015-11-20  Jeff KingMerge branch 'dk/gc-idx-wo-pack' blob | commitdiff | raw | diff to current
2015-11-05  Junio C HamanoMerge branch 'rs/daemon-plug-child-leak' into maint blob | commitdiff | raw | diff to current
2015-11-05  Junio C HamanoMerge branch 'rs/wt-status-detached-branch-fix' into... blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.