summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2010-03-24fmt-merge-msg: be quiet if nothing to mergeLibravatar Stephen Boyd1-0/+3
2010-03-24Merge branch 'tr/notes-display'Libravatar Junio C Hamano3-1/+246
2010-03-24Merge branch 'pb/log-first-parent-p-m'Libravatar Junio C Hamano2-15/+52
2010-03-21ls: remove redundant logicLibravatar Erik Faye-Lund2-9/+4
2010-03-21cherry: support --abbrev optionLibravatar Erik Faye-Lund1-18/+21
2010-03-20cherry-pick, revert: add a label for ancestorLibravatar Jonathan Nieder1-1/+4
2010-03-20revert: clarify label on conflict hunksLibravatar Jonathan Nieder1-39/+62
2010-03-20checkout -m --conflict=diff3: add a label for ancestorLibravatar Jonathan Nieder1-0/+1
2010-03-20checkout --conflict=diff3: add a label for ancestorLibravatar Jonathan Nieder1-1/+1
2010-03-20ll_merge(): add ancestor label parameter for diff3-style outputLibravatar Jonathan Nieder1-1/+1
2010-03-20merge-file --diff3: add a label for ancestorLibravatar Jonathan Nieder1-0/+1
2010-03-20xdl_merge(): move file1 and file2 labels to xmparam structureLibravatar Jonathan Nieder1-2/+3
2010-03-20Merge branch 'ml/color-grep'Libravatar Junio C Hamano1-8/+28
2010-03-20Merge branch 'cc/reset-keep'Libravatar Junio C Hamano1-9/+38
2010-03-20Merge branch 'bg/apply-fix-blank-at-eof'Libravatar Junio C Hamano1-40/+145
2010-03-20Merge branch 'bw/union-merge-refactor'Libravatar Junio C Hamano1-9/+14
2010-03-20Merge branch 'maint'Libravatar Junio C Hamano1-6/+5
2010-03-15grep: enable threading for context line printingLibravatar René Scharfe1-2/+13
2010-03-15Merge branch 'sd/format-patch-to'Libravatar Junio C Hamano1-39/+61
2010-03-15Merge branch 'tc/transport-verbosity'Libravatar Junio C Hamano3-20/+17
2010-03-15Merge branch 'ld/push-porcelain'Libravatar Junio C Hamano2-3/+7
2010-03-15Merge branch 'jh/notes'Libravatar Junio C Hamano1-0/+455
2010-03-13Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2010-03-10Merge branch 'sd/init-template'Libravatar Junio C Hamano1-0/+14
2010-03-10Merge branch 'sh/am-keep-cr'Libravatar Junio C Hamano1-1/+1
2010-03-10Merge branch 'cp/add-u-pathspec'Libravatar Junio C Hamano1-9/+29
2010-03-10Merge branch 'lt/deepen-builtin-source'Libravatar Junio C Hamano89-0/+42006
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLibravatar Linus Torvalds89-0/+42160
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 05:51:07 +0000