projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
revert: add "--strategy" option to choose merge strategy
[git] / builtin /
2010-04-01  Christian Couderrevert: add "--strategy" option to choose merge strategy tree | commitdiff
2010-04-01  Christian Coudermerge: make function try_merge_command non static tree | commitdiff
2010-04-01  Christian Coudermerge: refactor code that calls "git merge-STRATEGY" tree | commitdiff
2010-04-01  Christian Couderrevert: refactor merge recursive code into its own... tree | commitdiff
2010-04-01  Christian Couderrevert: use strbuf to refactor the code that writes... tree | commitdiff
2010-03-21  Jonathan Niedercherry-pick, revert: add a label for ancestor tree | commitdiff
2010-03-21  Jonathan Niederrevert: clarify label on conflict hunks tree | commitdiff
2010-03-21  Jonathan Niedercheckout -m --conflict=diff3: add a label for ancestor tree | commitdiff
2010-03-21  Jonathan Niedercheckout --conflict=diff3: add a label for ancestor tree | commitdiff
2010-03-21  Jonathan Niederll_merge(): add ancestor label parameter for diff3... tree | commitdiff
2010-03-21  Jonathan Niedermerge-file --diff3: add a label for ancestor tree | commitdiff
2010-03-21  Jonathan Niederxdl_merge(): move file1 and file2 labels to xmparam... tree | commitdiff
2010-03-20  Junio C HamanoMerge branch 'jk/maint-add-ignored-dir' tree | commitdiff
2010-03-20  Junio C HamanoMerge branch 'ml/color-grep' tree | commitdiff
2010-03-20  Junio C HamanoMerge branch 'jc/color-attrs' tree | commitdiff
2010-03-20  Junio C HamanoMerge branch 'cc/reset-keep' tree | commitdiff
2010-03-20  Junio C HamanoMerge branch 'fl/askpass' tree | commitdiff
2010-03-20  Junio C HamanoMerge branch 'bg/apply-fix-blank-at-eof' tree | commitdiff
2010-03-20  Junio C HamanoMerge branch 'bw/union-merge-refactor' tree | commitdiff
2010-03-20  Junio C HamanoMerge branch 'maint' tree | commitdiff
2010-03-17  Junio C HamanoMerge branch 'maint' tree | commitdiff
2010-03-17  Junio C HamanoMerge branch 'maint' tree | commitdiff
2010-03-15  Junio C HamanoMerge branch 'sd/format-patch-to' tree | commitdiff
2010-03-15  Junio C HamanoMerge branch 'tc/http-cleanup' tree | commitdiff
2010-03-15  Junio C HamanoMerge branch 'tc/transport-verbosity' tree | commitdiff
2010-03-15  Junio C HamanoMerge branch 'ld/push-porcelain' tree | commitdiff
2010-03-15  Junio C HamanoMerge branch 'jh/notes' tree | commitdiff
2010-03-14  Junio C HamanoMerge branch 'maint' tree | commitdiff
2010-03-13  Junio C HamanoMerge branch 'maint' tree | commitdiff
2010-03-10  Junio C HamanoMerge branch 'sd/init-template' tree | commitdiff
2010-03-10  Junio C HamanoMerge branch 'sh/am-keep-cr' tree | commitdiff
2010-03-10  Junio C HamanoMerge branch 'cp/add-u-pathspec' tree | commitdiff
2010-03-10  Junio C HamanoMerge branch 'lt/deepen-builtin-source' tree | commitdiff
2010-02-22  Linus TorvaldsMove 'builtin-*' into a 'builtin/' subdirectory tree | commitdiff
Unnamed repository; edit this file 'description' to name the repository.