]> git.ipfire.org Git - thirdparty/git.git/history - builtin/merge.c
Merge branch 'mg/placeholders-are-lowercase'
[thirdparty/git.git] / builtin / merge.c
2011-02-28  Junio C HamanoMerge branch 'mg/placeholders-are-lowercase'
2011-02-28  Junio C HamanoMerge branch 'mg/patch-id'
2011-02-28  Junio C HamanoMerge branch 'mz/rerere-remaining'
2011-02-28  Junio C HamanoMerge branch 'nd/sorted-builtin-command-list'
2011-02-28  Junio C HamanoMerge branch 'js/maint-merge-use-prepare-commit-msg...
2011-02-28  Junio C HamanoMerge branch 'nd/hash-object-sanity'
2011-02-28  Junio C HamanoMerge branch 'va/p4'
2011-02-28  Junio C HamanoMerge branch 'pw/p4'
2011-02-28  Junio C HamanoMerge branch 'uk/checkout-ambiguous-ref'
2011-02-28  Junio C HamanoMerge branch 'sp/maint-smart-http-sans-100-continue'
2011-02-28  Junio C HamanoMerge branch 'mo/perl-bidi-pipe-envfix'
2011-02-28  Junio C HamanoMerge branch 'hv/mingw-fs-funnies'
2011-02-28  Junio C HamanoMerge branch 'en/object-list-with-pathspec'
2011-02-28  Junio C HamanoMerge branch 'nd/struct-pathspec'
2011-02-27  Junio C HamanoMerge branch 'maint'
2011-02-22  Junio C HamanoMerge branch 'maint'
2011-02-22  Junio C HamanoMerge branch 'maint'
2011-02-16  Junio C HamanoMerge branch 'maint'
2011-02-16  Junio C HamanoMerge branch 'maint-1.7.3' into maint
2011-02-16  Junio C HamanoMerge branch 'maint-1.7.2' into maint-1.7.3
2011-02-16  Junio C HamanoMerge branch 'maint-1.7.1' into maint-1.7.2
2011-02-16  Junio C HamanoMerge branch 'maint-1.7.0' into maint-1.7.1
2011-02-15  Jay Soffianmerge: honor prepare-commit-msg hook
2011-02-15  Michael J GruberMake <identifier> lowercase as per CodingGuidelines
2011-02-15  Junio C HamanoMerge branch 'maint'
2011-02-15  Michael J Grubercommit,merge,tag: describe -m likewise
2011-02-12  Junio C HamanoMerge branch 'maint'
2011-02-10  Junio C HamanoMerge branch 'maint'
2011-02-10  Junio C HamanoMerge branch 'tr/merge-unborn-clobber'
2011-02-10  Junio C HamanoMerge branch 'jc/unpack-trees'
2011-02-10  Junio C HamanoMerge branch 'jc/fsck-fixes'
2011-02-10  Junio C HamanoMerge branch 'tr/diff-words-test'
2011-02-10  Junio C HamanoMerge branch 'rr/fi-import-marks-if-exists'
2011-02-10  Junio C HamanoMerge branch 'jn/unpack-lstat-failure-report'
2011-02-10  Junio C HamanoMerge branch 'ef/alias-via-run-command'
2011-02-10  Junio C HamanoMerge branch 'cb/setup'
2011-02-10  Junio C HamanoMerge branch 'ae/better-template-failure-report'
2011-02-10  Junio C HamanoMerge branch 'jn/cherry-pick-strategy-option'
2011-02-10  Junio C HamanoMerge branch 'maint-1.7.0' into maint
2011-01-31  Junio C HamanoMerge branch 'jl/fetch-submodule-recursive' into maint
2011-01-27  Junio C HamanoMerge branch 'maint'
2011-01-27  Junio C HamanoMerge branch 'jn/fast-import-empty-tree-removal' into...
2011-01-19  Junio C HamanoMerge branch 'maint'
2011-01-19  Junio C HamanoMerge branch 'jk/diff-driver-binary-doc' into maint
2011-01-19  Junio C HamanoMerge branch 'tr/submodule-relative-scp-url' into maint
2011-01-19  Junio C HamanoMerge branch 'jn/maint-fast-import-object-reuse' into...
2011-01-19  Junio C HamanoMerge branch 'jn/submodule-b-current' into maint
2011-01-19  Junio C HamanoMerge branch 'jc/maint-svn-info-test-fix' into maint
2011-01-19  Junio C HamanoMerge branch 'nd/maint-relative' into maint
2011-01-13  Junio C HamanoMerge branch 'jn/gitweb-no-logo'
2011-01-13  Junio C HamanoMerge branch 'jk/diff-driver-binary-doc'
2011-01-13  Junio C HamanoMerge branch 'tr/submodule-relative-scp-url'
2011-01-13  Junio C HamanoMerge branch 'maint'
2011-01-10  Junio C HamanoMerge branch 'maint'
2011-01-10  Junio C HamanoMerge branch 'maint-1.7.2' into maint
2011-01-10  Junio C HamanoMerge branch 'maint-1.7.1' into maint-1.7.2
2011-01-10  Junio C HamanoMerge branch 'maint-1.7.0' into maint-1.7.1
2011-01-09  Junio C HamanoMerge branch 'maint'
2011-01-05  Junio C HamanoMerge branch 'maint' to sync with 1.7.3.5
2011-01-05  Junio C HamanoMerge branch 'jn/svn-fe' (early part)
2011-01-05  Junio C HamanoMerge branch 'ao/t9001-fix'
2011-01-05  Junio C HamanoMerge branch 'mg/cvsimport'
2011-01-04  Junio C HamanoMerge branch 'maint'
2010-12-28  Junio C HamanoMerge branch 'maint'
2010-12-28  Junio C HamanoMerge branch 'kb/maint-status-cquote' into maint
2010-12-28  Jonathan Niedercherry-pick/revert: add support for -X/--strategy-option
2010-12-28  Junio C HamanoMerge branch 'jc/maint-rebase-rewrite-last-skip'
2010-12-28  Junio C HamanoMerge branch 'nd/setup'
2010-12-26  Junio C HamanoMerge branch 'rs/maint-diff-fd-leak' into maint
2010-12-23  Junio C HamanoMerge branch 'rj/maint-difftool-cygwin-workaround'
2010-12-23  Junio C HamanoMerge branch 'maint'
2010-12-22  Junio C HamanoMerge branch 'rj/maint-test-fixes'
2010-12-22  Junio C HamanoMerge branch 'jc/maint-am-abort-safely'
2010-12-22  Junio C HamanoMerge branch 'jk/commit-die-on-bogus-ident'
2010-12-22  Junio C HamanoMerge branch 'pd/bash-4-completion'
2010-12-22  Junio C HamanoMerge branch 'nd/maint-fix-add-typo-detection'
2010-12-22  Junio C HamanoMerge branch 'tf/commit-list-prefix'
2010-12-21  Junio C HamanoMerge branch 'maint'
2010-12-21  Junio C HamanoMerge branch 'ks/blame-worktree-textconv-cached'
2010-12-21  Junio C HamanoMerge branch 'jk/maint-decorate-01-bool'
2010-12-21  Junio C HamanoMerge branch 'nd/oneline-sha1-name-from-specific-ref'
2010-12-21  Junio C HamanoMerge branch 'jn/maint-gitweb-pathinfo-fix'
2010-12-20  Junio C HamanoMerge branch 'maint'
2010-12-17  Junio C HamanoMerge branch 'maint'
2010-12-16  Junio C HamanoMerge branch 'kb/diff-C-M-synonym'
2010-12-16  Junio C HamanoMerge branch 'jn/fast-import-blob-access'
2010-12-16  Junio C HamanoMerge branch 'jl/fetch-submodule-recursive'
2010-12-16  Junio C HamanoMerge branch 'rj/msvc-fix'
2010-12-16  Junio C HamanoMerge branch 'nd/extended-sha1-relpath'
2010-12-16  Junio C HamanoMerge branch 'aa/status-hilite-branch'
2010-12-16  Junio C HamanoMerge branch 'ak/describe-exact'
2010-12-16  Junio C HamanoMerge branch 'nd/maint-relative'
2010-12-16  Junio C HamanoMerge branch 'jn/maint-svn-fe'
2010-12-16  Junio C HamanoMerge branch 'jc/maint-svn-info-test-fix'
2010-12-16  Junio C HamanoMerge branch 'jn/submodule-b-current'
2010-12-16  Junio C HamanoMerge branch 'jn/maint-fast-import-object-reuse'
2010-12-16  Junio C HamanoMerge branch 'jn/fast-import-ondemand-checkpoint'
2010-12-16  Junio C HamanoSync with 1.7.3.4
2010-12-15  Junio C HamanoGit 1.7.3.4 v1.7.3.4
2010-12-15  Junio C HamanoGit 1.7.2.5 v1.7.2.5
next