summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)Author
2010-03-21checkout -m --conflict=diff3: add a label for ancestorJonathan Nieder
2010-03-21checkout --conflict=diff3: add a label for ancestorJonathan Nieder
2010-03-21ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder
2010-03-21merge-file --diff3: add a label for ancestorJonathan Nieder
2010-03-21xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder
2010-03-20Merge branch 'ml/color-grep'Junio C Hamano
2010-03-20Merge branch 'cc/reset-keep'Junio C Hamano
2010-03-20Merge branch 'bg/apply-fix-blank-at-eof'Junio C Hamano
2010-03-20Merge branch 'bw/union-merge-refactor'Junio C Hamano
2010-03-20Merge branch 'maint'Junio C Hamano
2010-03-15Merge branch 'sd/format-patch-to'Junio C Hamano
2010-03-15Merge branch 'tc/transport-verbosity'Junio C Hamano
2010-03-15Merge branch 'ld/push-porcelain'Junio C Hamano
2010-03-15Merge branch 'jh/notes'Junio C Hamano
2010-03-14Merge branch 'maint'Junio C Hamano
2010-03-10Merge branch 'sd/init-template'Junio C Hamano
2010-03-10Merge branch 'sh/am-keep-cr'Junio C Hamano
2010-03-10Merge branch 'cp/add-u-pathspec'Junio C Hamano
2010-03-10Merge branch 'lt/deepen-builtin-source'Junio C Hamano
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds
generated by cgit v0.10.2-6-g49f6 at 2024-04-26 12:56:23 (GMT)