commit: fix patch hunk editing with "commit -p -m"
[git/git.git] / builtin / merge.c
2014-03-18 Benoit Pierrecommit: fix patch hunk editing with "commit -p -m"
2014-02-13 Junio C HamanoSync with 1.8.5.5
2014-02-13 Junio C HamanoMerge branch 'bm/merge-base-octopus-dedup' into maint
2014-02-13 Junio C HamanoMerge branch 'jc/revision-range-unpeel' into maint
2014-02-13 Junio C HamanoMerge branch 'jk/allow-fetch-onelevel-refname' into...
2014-02-13 Junio C HamanoMerge branch 'sb/repack-in-c' into maint
2014-02-13 Junio C HamanoMerge branch 'as/tree-walk-fix-aggressive-short-cut...
2014-02-07 Junio C HamanoMerge branch 'ow/manpages-typofix'
2014-02-07 Junio C HamanoMerge branch 'aj/ada-diff-word-pattern'
2014-02-07 Junio C HamanoMerge branch 'nd/tag-doc'
2014-02-05 Junio C HamanoSync with 1.8.5.4
2014-02-05 Junio C HamanoMerge branch 'jc/maint-pull-docfix' into maint
2014-02-05 Junio C HamanoMerge branch 'bc/log-decoration' into maint
2014-02-05 Junio C HamanoMerge branch 'tr/send-email-ssl' into maint
2014-02-05 Junio C HamanoMerge branch 'tb/clone-ssh-with-colon-for-port' into...
2014-02-05 Junio C HamanoMerge branch 'nd/transport-positive-depth-only' into...
2014-02-05 Junio C HamanoMerge branch 'tb/repack-fix-renames' (early part)
2014-01-31 Junio C HamanoMerge git://github.com/git-l10n/git-po
2014-01-31 Junio C HamanoMerge branch 'jn/pager-lv-default-env'
2014-01-27 Junio C HamanoMerge branch 'as/tree-walk-fix-aggressive-short-cut'
2014-01-27 Junio C HamanoMerge branch 'ta/doc-http-protocol-in-html'
2014-01-27 Junio C HamanoMerge branch 'mh/doc-wo-names'
2014-01-27 Junio C HamanoMerge branch 'jk/revision-o-is-in-libgit-a'
2014-01-27 Junio C HamanoMerge branch 'sb/repack-in-c'
2014-01-27 Junio C HamanoMerge branch 'jk/test-fixes'
2014-01-27 Junio C HamanoMerge branch 'nd/negative-pathspec'
2014-01-27 Junio C HamanoMerge branch 'pw/git-p4'
2014-01-27 Junio C HamanoMerge branch 'ss/safe-create-leading-dir-with-slash'
2014-01-27 Junio C HamanoMerge branch 'mh/safe-create-leading-directories'
2014-01-27 Junio C HamanoMerge branch 'tr/nth-previous-is-a-commit'
2014-01-27 Junio C HamanoMerge branch 'tr/gitk-doc-range-trace'
2014-01-27 Junio C HamanoMerge branch 'jk/mark-edges-uninteresting'
2014-01-27 Junio C HamanoMerge branch 'jk/diff-filespec-cleanup'
2014-01-27 Junio C HamanoMerge branch 'ef/mingw-write'
2014-01-27 Junio C HamanoMerge branch 'rk/send-email-ssl-cert'
2014-01-27 Junio C HamanoMerge branch 'jn/ignore-doc'
2014-01-27 Junio C HamanoMerge branch 'jk/interpret-branch-name-fix'
2014-01-27 Junio C HamanoMerge branch 'jk/allow-fetch-onelevel-refname'
2014-01-27 Junio C HamanoMerge branch 'jc/revision-range-unpeel'
2014-01-27 Junio C HamanoMerge branch 'mh/retire-ref-fetch-rules'
2014-01-27 Junio C HamanoMerge branch 'mh/attr-macro-doc'
2014-01-27 Junio C HamanoMerge branch 'jc/maint-pull-docfix'
2014-01-27 Junio C HamanoMerge branch 'ab/subtree-doc'
2014-01-23 Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-01-21 Junio C HamanoMerge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
2014-01-17 Junio C HamanoMerge branch 'maint'
2014-01-17 Junio C HamanoMerge branch 'fp/submodule-checkout-mode'
2014-01-17 Junio C HamanoMerge branch 'nd/shallow-clone'
2014-01-17 Erik Faye-Lundprefer xwrite instead of write
2014-01-17 Junio C HamanoMerge branch 'jk/pull-rebase-using-fork-point'
2014-01-14 Junio C HamanoMerge branch 'jc/maint-pull-docfix-for-409b8d82' into...
2014-01-13 Junio C HamanoSync with 1.8.5.3
2014-01-13 Junio C HamanoMerge branch 'jk/t5531-prepare-to-default-to-non-matching'
2014-01-13 Junio C HamanoMerge branch 'sb/diff-orderfile-config'
2014-01-13 Junio C HamanoMerge branch 'mh/shorten-unambigous-ref'
2014-01-13 Junio C HamanoMerge branch 'mm/mv-file-to-no-such-dir-with-slash'
2014-01-13 Junio C HamanoMerge branch 'jk/pull-rebase-using-fork-point'
2014-01-13 Junio C HamanoMerge branch 'ow/stash-with-ifs'
2014-01-13 Junio C HamanoMerge branch 'jn/pager-lv-default-env'
2014-01-13 Junio C HamanoMerge branch 'br/sha1-name-40-hex-no-disambiguation'
2014-01-13 Junio C HamanoMerge branch 'nd/daemon-informative-errors-typofix...
2014-01-10 Junio C HamanoMerge branch 'ta/format-user-manual-as-an-article'
2014-01-10 Junio C HamanoMerge branch 'js/lift-parent-count-limit'
2014-01-10 Junio C HamanoMerge branch 'jk/test-framework-updates'
2014-01-10 Junio C HamanoMerge branch 'bm/merge-base-octopus-dedup'
2014-01-10 Junio C HamanoMerge branch 'km/gc-eperm'
2014-01-10 Junio C HamanoMerge branch 'jk/http-auth-tests-robustify'
2014-01-10 Junio C HamanoMerge branch 'jk/credential-plug-leak'
2014-01-10 Junio C HamanoMerge branch 'bs/mirbsd'
2014-01-10 Junio C HamanoMerge branch 'nd/commit-tree-constness'
2014-01-10 Junio C HamanoMerge branch 'nd/add-empty-fix'
2014-01-10 Junio C HamanoMerge branch 'nd/daemon-informative-errors-typofix'
2014-01-10 Junio C HamanoMerge branch 'sb/diff-orderfile-config'
2014-01-10 Junio C HamanoMerge branch 'bc/log-decoration'
2014-01-10 Junio C HamanoMerge branch 'jh/rlimit-nofile-fallback'
2014-01-10 Junio C HamanoMerge branch 'rt/bfg-ad-in-filter-branch-doc'
2014-01-10 Junio C HamanoMerge branch 'mh/path-max'
2014-01-10 Junio C HamanoMerge branch 'ap/path-max'
2014-01-10 Junio C HamanoMerge branch 'cc/replace-object-info'
2014-01-10 Junio C HamanoMerge branch 'nd/negative-pathspec'
2014-01-06 Junio C HamanoMerge branch 'maint'
2013-12-30 Junio C HamanoMerge branch 'maint'
2013-12-27 Junio C HamanoMerge branch 'fc/remote-helper-fixes'
2013-12-27 Junio C HamanoMerge branch 'js/gnome-keyring'
2013-12-27 Junio C HamanoMerge branch 'jk/name-pack-after-byte-representation'
2013-12-27 Junio C HamanoMerge branch 'tg/diff-no-index-refactor'
2013-12-27 Junio C HamanoMerge branch 'zk/difftool-counts'
2013-12-27 Junio C HamanoMerge branch 'jk/cat-file-regression-fix'
2013-12-27 Junio C HamanoMerge branch 'jk/pull-rebase-using-fork-point'
2013-12-27 Junio C HamanoMerge branch 'jk/rev-parse-double-dashes'
2013-12-27 Junio C HamanoMerge branch 'jc/push-refmap'
2013-12-17 Junio C HamanoSync with 1.8.5.2
2013-12-17 Junio C HamanoMerge branch 'kn/gitweb-extra-branch-refs'
2013-12-17 Junio C HamanoMerge branch 'tb/clone-ssh-with-colon-for-port'
2013-12-17 Junio C HamanoMerge branch 'nd/transport-positive-depth-only'
2013-12-17 Junio C HamanoMerge branch 'cc/starts-n-ends-with'
2013-12-17 Junio C HamanoMerge branch 'tr/send-email-ssl'
2013-12-17 Junio C HamanoMerge branch 'bc/doc-merge-no-op-revert'
2013-12-17 Junio C HamanoMerge branch 'kb/doc-exclude-directory-semantics'
2013-12-17 Junio C HamanoMerge branch 'rs/doc-submitting-patches' into maint
next