Code

msvc: Fix an "unrecognized option" linker warning
[git.git] / builtin-merge-file.c
2010-01-23 Junio C HamanoMerge branch 'maint'
2010-01-23 Junio C HamanoMerge branch 'jc/branch-d'
2010-01-23 Junio C HamanoMerge branch 'il/rev-glob'
2010-01-23 Junio C HamanoMerge branch 'js/refer-upstream'
2010-01-23 Junio C HamanoMerge branch 'jl/submodule-diff'
2010-01-23 Junio C HamanoMerge branch 'il/remote-updates'
2010-01-23 Junio C HamanoMerge branch 'il/branch-set-upstream'
2010-01-23 Junio C HamanoMerge branch 'jc/maint-limit-note-output'
2010-01-23 Junio C HamanoMerge branch 'nd/ls-files-sparse-fix'
2010-01-22 Junio C HamanoMerge branch 'maint'
2010-01-21 Junio C HamanoMerge branch 'bw/cvsimport'
2010-01-21 Junio C HamanoMerge branch 'jc/checkout-merge-base'
2010-01-21 Junio C HamanoMerge branch 'ag/patch-header-verify'
2010-01-21 Junio C HamanoMerge branch 'jc/conflict-marker-size'
2010-01-21 Junio C HamanoMerge branch 'ag/maint-apply-too-large-p'
2010-01-21 Junio C HamanoMerge branch 'ap/merge-backend-opts'
2010-01-19 Junio C HamanoMerge branch 'maint-1.6.3' into maint-1.6.4
2010-01-17 Junio C HamanoMerge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
2010-01-17 Junio C Hamanoxdl_merge(): introduce xmparam_t for merge specific...
2010-01-10 Junio C HamanoMerge branch 'maint-1.6.2' into maint
2010-01-10 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-12-31 Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-12-30 Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-12-30 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-12-27 Junio C HamanoMerge branch 'nf/maint-fix-index-ext-len-on-be64' into...
2009-12-09 Junio C HamanoMerge git://repo.or.cz/git-gui
2009-12-09 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-12-03 Junio C HamanoMerge branch 'jc/maint-am-keep' into maint
2009-12-03 Junio C HamanoMerge branch 'np/maint-sideband-favor-status' into...
2009-11-30 Junio C HamanoMerge branch 'jc/maint-am-keep'
2009-11-30 Junio C Hamanogit-merge-file --ours, --theirs
2009-11-18 Junio C HamanoMerge branch 'np/maint-sideband-favor-status'
2009-11-16 Junio C HamanoMerge branch 'jk/maint-1.6.3-ls-files-i' into maint
2009-11-16 Junio C HamanoMerge branch 'jc/maint-1.6.3-graft-trailing-space'...
2009-11-16 Junio C HamanoMerge branch 'tr/maint-roff-quote' into maint
2009-11-10 Junio C HamanoMerge branch 'jk/maint-1.6.3-ls-files-i'
2009-10-31 Junio C HamanoMerge branch 'jc/maint-1.6.3-graft-trailing-space'
2009-10-31 Junio C HamanoMerge branch 'tr/maint-roff-quote'
2009-10-27 Junio C HamanoMerge git://repo.or.cz/git-gui
2009-10-25 Junio C HamanoMerge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached...
2009-10-25 Junio C HamanoMerge branch 'jn/maint-1.6.3-check-ref-format-doc'...
2009-10-24 Junio C HamanoMerge branch 'jn/maint-1.6.3-check-ref-format-doc'...
2009-10-19 Junio C HamanoMerge branch 'jn/maint-1.6.3-check-ref-format-doc'
2009-10-19 Junio C HamanoMerge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached'
2009-10-04 Junio C HamanoMerge branch 'jc/maint-1.6.4-show-branch-default' into...
2009-09-21 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-09-16 Junio C HamanoMerge branch 'jc/maint-unpack-objects-strict' into...
2009-09-16 Junio C HamanoMerge branch 'tf/diff-whitespace-incomplete-line' into...
2009-09-16 Junio C HamanoMerge branch 'jk/maint-1.6.3-checkout-unborn' into...
2009-09-15 Junio C HamanoMerge branch 'jc/maint-1.6.0-blank-at-eof' into jc...
2009-09-15 Junio C HamanoMerge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-15 Junio C HamanoMerge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-15 Junio C HamanoMerge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-13 Junio C HamanoMerge branch 'cb/maint-1.6.3-grep-relative-up' into...
2009-09-07 Junio C HamanoMerge branch 'np/maint-1.6.3-deepen'
2009-09-03 Junio C HamanoMerge branch 'maint-1.6.3' into maint
2009-09-03 Junio C HamanoMerge branch 'maint-1.6.3' into maint
2009-09-01 Junio C HamanoMerge branch 'tf/diff-whitespace-incomplete-line'
2009-08-29 Junio C HamanoMerge branch 'jk/maint-1.6.3-checkout-unborn'
2009-08-29 Junio C HamanoMerge branch 'np/maint-1.6.3-deepen'
2009-08-28 Junio C HamanoMerge branch 'maint-1.6.3' into maint
2009-08-28 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-08-27 Junio C HamanoMerge branch 'jc/maint-unpack-objects-strict'
2009-08-26 Junio C HamanoMerge branch 'maint-1.6.3' into maint
2009-08-21 Junio C HamanoMerge branch 'jc/maint-merge-recursive-fix' into maint
2009-08-19 Junio C HamanoMerge branch 'tr/maint-1.6.3-add-p-modeonly-fix'
2009-08-16 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-08-12 Junio C HamanoMerge branch 'maint-1.6.3' into maint
2009-08-11 Junio C HamanoMerge branch 'maint-1.6.3' into maint
2009-08-11 Junio C HamanoMerge branch 'jc/maint-merge-recursive-fix'
2009-08-08 Junio C HamanoMerge branch 'maint-1.6.3' into maint
2009-08-08 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-08-05 Junio C HamanoMerge branch 'maint-1.6.3' into maint
2009-07-29 Junio C HamanoMerge branch 'hv/cvsps-tests'
2009-07-29 Junio C HamanoSync with 1.6.3.4
2009-07-26 Junio C HamanoMerge branch 'gp/maint-rebase-p-onto'
2009-07-25 Junio C HamanoMerge branch 'maint'
2009-07-25 Junio C HamanoMerge branch 'maint'
2009-07-25 Junio C HamanoMerge branch 'js/maint-graft-unhide-true-parents'
2009-07-25 Junio C HamanoMerge branch 'av/maint-config-reader'
2009-07-25 Junio C HamanoMerge branch 'jk/maint-send-email-alias-loop'
2009-07-24 Junio C HamanoMerge branch 'maint'
2009-07-23 Junio C HamanoMerge branch 'maint'
2009-07-18 Junio C HamanoMerge branch 'maint'
2009-07-11 Junio C HamanoMerge branch 'ae/maint-mailinfo-rm-only-one-patch-marker'
2009-07-08 Junio C HamanoMerge branch 'maint'
2009-07-06 Junio C HamanoMerge branch 'cb/maint-fetch-refspec-wo-dst'
2009-07-06 Junio C HamanoMerge branch 'gb/am-foreign'
2009-07-02 Junio C HamanoMerge branch 'cc/bisect'
2009-07-02 Junio C HamanoMerge branch 'cf/maint-remote-uploadpack-useconfig...
2009-07-02 Junio C HamanoMerge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'
2009-07-02 Junio C HamanoMerge branch 'maint'
2009-06-30 Junio C HamanoMerge branch 'maint'
2009-06-27 Junio C HamanoMerge branch 'maint'
2009-06-22 Junio C HamanoMerge branch 'maint'
2009-06-22 Junio C HamanoMerge branch 'sb/maint-1.6.0-add-config-fix' into maint
2009-06-22 Junio C HamanoSync with 1.6.3.3
2009-06-21 Junio C HamanoMerge branch 'maint'
2009-06-21 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-06-21 Junio C HamanoMerge branch 'ph/submodule-rebase'
next