merge: use skip_prefix()
[git/git.git] / builtin / merge.c
2017-08-10 René Scharfemerge: use skip_prefix()
2017-08-01 Junio C HamanoMerge tag 'v2.12.4' into maint
2017-07-31 Junio C HamanoMerge branch 'jn/hooks-pre-rebase-sample-fix' into...
2017-07-31 Junio C HamanoMerge branch 'rs/apply-avoid-over-reading' into maint
2017-07-30 Junio C HamanoMerge tag 'v2.11.3' into maint-2.12
2017-07-30 Junio C HamanoMerge tag 'v2.10.4' into maint-2.11
2017-07-30 Junio C HamanoMerge tag 'v2.9.5' into maint-2.10
2017-07-30 Junio C HamanoMerge tag 'v2.8.6' into maint-2.9
2017-07-30 Junio C HamanoMerge tag 'v2.7.6' into maint-2.8
2017-07-21 Junio C HamanoMerge branch 'ew/fd-cloexec-fix' into maint
2017-07-21 Junio C HamanoMerge branch 'ks/fix-rebase-doc-picture' into maint
2017-07-21 Junio C HamanoMerge branch 'bb/unicode-10.0' into maint
2017-07-12 Junio C HamanoMerge branch 'kn/ref-filter-branch-list' into maint
2017-07-10 Junio C HamanoMerge branch 'jc/utf8-fprintf' into maint
2017-07-10 Junio C HamanoMerge branch 'js/fsck-name-object' into maint
2017-07-10 Junio C HamanoMerge branch 'js/t5534-rev-parse-gives-multi-line-outpu...
2017-07-10 Junio C HamanoMerge branch 'aw/contrib-subtree-doc-asciidoctor' into...
2017-07-10 Junio C HamanoMerge branch 'ah/doc-pretty-color-auto-prefix' into...
2017-07-10 Junio C HamanoMerge branch 'mb/reword-autocomplete-message' into...
2017-07-10 Junio C HamanoMerge branch 'ks/t7508-indent-fix' into maint
2017-07-10 Junio C HamanoMerge branch 'sb/t4005-modernize' into maint
2017-07-10 Junio C HamanoMerge branch 'rs/apply-validate-input' into maint
2017-07-10 Junio C HamanoMerge branch 'jc/pack-bitmap-unaligned' into maint
2017-07-10 Junio C HamanoMerge branch 'pw/rebase-i-regression-fix-tests' into...
2017-07-10 Junio C HamanoMerge branch 'jk/add-p-commentchar-fix' into maint
2017-07-10 Junio C HamanoMerge branch 'rs/pretty-add-again' into maint
2017-06-24 Junio C HamanoMerge branch 'sg/doc-pretty-formats' into maint
2017-06-24 Junio C HamanoMerge branch 'sg/revision-parser-skip-prefix' into...
2017-06-24 Junio C HamanoMerge branch 'km/test-mailinfo-b-failure' into maint
2017-06-24 Junio C HamanoMerge branch 'sb/submodule-rm-absorb' into maint
2017-06-24 Junio C HamanoMerge branch 'jc/diff-tree-stale-comment' into maint
2017-06-24 Junio C HamanoMerge branch 'ps/stash-push-pathspec-fix' into maint
2017-06-24 Junio C HamanoMerge branch 'jk/pack-idx-corruption-safety' into maint
2017-06-24 Junio C HamanoMerge branch 'jc/name-rev-lw-tag' into maint
2017-06-13 Junio C HamanoMerge branch 'jk/connect-symref-info-leak-fix' into...
2017-06-13 Junio C HamanoMerge branch 'ab/t3070-test-dedup' into maint
2017-06-13 Junio C HamanoMerge branch 'jh/memihash-opt' into maint
2017-06-13 Junio C HamanoMerge branch 'jh/close-index-before-stat' into maint
2017-06-13 Junio C HamanoMerge branch 'sl/clean-d-ignored-fix' into maint
2017-06-13 Junio C HamanoMerge branch 'dk/send-email-avoid-net-smtp-ssl-when...
2017-06-13 Junio C HamanoMerge branch 'bw/forking-and-threading' into maint
2017-06-05 Junio C HamanoMerge branch 'ah/doc-filter-branch-export-env' into...
2017-06-05 Junio C HamanoMerge branch 'sd/t3200-typofix' into maint
2017-06-05 Junio C HamanoMerge branch 'sb/t5531-update-desc' into maint
2017-06-05 Junio C HamanoMerge branch 'ah/doc-pretty-format-fix' into maint
2017-06-05 Junio C HamanoMerge branch 'ah/doc-interpret-trailers-ifexists' into...
2017-06-05 Junio C HamanoMerge branch 'ab/ref-filter-no-contains' into maint
2017-06-05 Junio C HamanoMerge branch 'sg/core-filemode-doc-typofix' into maint
2017-06-05 Junio C HamanoMerge branch 'jn/credential-doc-on-clear' into maint
2017-06-05 Junio C HamanoMerge branch 'js/bs-is-a-dir-sep-on-windows' into maint
2017-06-05 Junio C HamanoMerge branch 'jk/alternate-ref-optim' into maint
2017-06-05 Junio C HamanoMerge branch 'kn/ref-filter-branch-list' into maint
2017-06-05 Junio C HamanoMerge branch 'rs/checkout-am-fix-unborn' into maint
2017-06-05 Junio C HamanoMerge branch 'jn/clone-add-empty-config-from-command...
2017-06-05 Junio C HamanoMerge branch 'ls/travis-doc-asciidoctor' into maint
2017-06-04 Junio C HamanoMerge branch 'tg/stash-push-fixup' into maint
2017-06-04 Junio C HamanoMerge branch 'km/log-showsignature-doc' into maint
2017-06-04 Junio C HamanoMerge branch 'jt/use-trailer-api-in-commands' into...
2017-06-04 Junio C HamanoMerge branch 'jt/push-options-doc' into maint
2017-06-04 Junio C HamanoMerge branch 'jk/update-links-in-docs' into maint
2017-06-04 Junio C HamanoMerge branch 'jk/ignore-broken-tags-when-ignoring-missi...
2017-06-04 Junio C HamanoMerge branch 'jk/disable-pack-reuse-when-broken' into...
2017-06-04 Junio C HamanoMerge branch 'jk/am-leakfix' into maint
2017-06-04 Junio C HamanoMerge branch 'jc/read-tree-empty-with-m' into maint
2017-06-04 Junio C HamanoMerge branch 'jc/apply-fix-mismerge' into maint
2017-06-04 Junio C HamanoMerge branch 'ja/do-not-ask-needless-questions' into...
2017-06-04 Junio C HamanoMerge branch 'bw/submodule-with-bs-path' into maint
2017-06-04 Junio C HamanoMerge branch 'ah/log-decorate-default-to-auto' into...
2017-06-04 Junio C HamanoMerge branch 'ab/aix-needs-compat-regex' into maint
2017-06-04 Junio C HamanoMerge branch 'pw/rebase-i-regression-fix' into maint
2017-05-09 Junio C HamanoSync with v2.12.3
2017-05-09 Junio C HamanoMerge branch 'jh/verify-index-checksum-only-in-fsck'
2017-05-05 Junio C HamanoMerge branch 'maint-2.11' into maint
2017-05-05 Junio C HamanoMerge branch 'maint-2.10' into maint-2.11
2017-05-05 Junio C HamanoMerge branch 'maint-2.9' into maint-2.10
2017-05-05 Junio C HamanoMerge branch 'maint-2.8' into maint-2.9
2017-05-05 Junio C HamanoMerge branch 'maint-2.7' into maint-2.8
2017-05-05 Junio C HamanoMerge branch 'maint-2.6' into maint-2.7
2017-05-05 Junio C HamanoMerge branch 'maint-2.5' into maint-2.6
2017-05-05 Junio C HamanoMerge branch 'maint-2.4' into maint-2.5
2017-05-04 Junio C HamanoMerge branch 'sr/hooks-cwd-doc'
2017-05-04 Junio C HamanoMerge branch 'rg/doc-submittingpatches-wordfix'
2017-05-04 Junio C HamanoMerge branch 'rg/doc-pull-typofix'
2017-05-01 Junio C HamanoMerge branch 'jk/submodule-init-segv-fix'
2017-05-01 Junio C HamanoMerge branch 'jk/prio-queue-avoid-swap-with-self'
2017-04-26 Junio C HamanoMerge branch 'mh/separate-ref-cache'
2017-04-26 Junio C HamanoMerge branch 'nd/worktree-add-lock'
2017-04-26 Junio C HamanoMerge branch 'jk/update-links-in-docs'
2017-04-26 Junio C HamanoMerge branch 'sf/putty-w-args'
2017-04-26 Junio C HamanoMerge branch 'ab/completion-push-delete-ref'
2017-04-26 Junio C HamanoMerge branch 'cc/split-index-config'
2017-04-26 Junio C HamanoMerge branch 'jk/war-on-git-path'
2017-04-26 Junio C HamanoMerge branch 'jh/add-index-entry-optim'
2017-04-26 Junio C HamanoMerge branch 'ss/submodule-shallow-doc'
2017-04-26 Junio C HamanoMerge branch 'ss/gitmodules-ignore-doc'
2017-04-26 Junio C HamanoMerge branch 'nd/conditional-config-in-early-config'
2017-04-26 Junio C HamanoMerge branch 'ab/push-cas-doc-n-test'
2017-04-26 Junio C HamanoMerge branch 'ls/travis-coccicheck'
2017-04-26 Junio C HamanoMerge branch 'ps/pathspec-empty-prefix-origin'
2017-04-26 Junio C HamanoMerge branch 'pc/t2027-git-to-pipe-cleanup'
next