]> git.ipfire.org Git - thirdparty/git.git/history - resolve-undo.c
msvc: Fix an "unrecognized option" linker warning
[thirdparty/git.git] / resolve-undo.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-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 'ag/maint-apply-too-large-p'
2010-01-21  Junio C HamanoMerge branch 'ap/merge-backend-opts'
2010-01-21  Junio C HamanoMerge branch 'nd/status-partial-refresh'
2010-01-21  Junio C HamanoMerge remote branch 'remotes/trast-doc/for-next'
2010-01-21  Junio C HamanoMerge branch 'jh/notes' (early part)
2010-01-21  Junio C HamanoMerge branch 'maint'
2010-01-20  Junio C HamanoMerge branch 'rr/core-tutorial'
2010-01-20  Junio C HamanoMerge branch 'jc/cache-unmerge'
2009-12-26  Junio C Hamanoresolve-undo: "checkout -m path" uses resolve-undo...
2009-12-26  Junio C Hamanoresolve-undo: record resolved conflicts in a new index...