summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)Author
2010-04-06Merge branch 'ef/maint-empty-commit-log'Junio C Hamano
2010-04-03Merge branch 'mg/use-default-abbrev-length-in-rev-list'Junio C Hamano
2010-04-03Merge branch 'jn/merge-diff3-label'Junio C Hamano
2010-04-03Merge branch 'ef/cherry-abbrev'Junio C Hamano
2010-04-03Merge branch 'rs/threaded-grep-context'Junio C Hamano
2010-04-02builtin/commit: remove unnecessary variable definitionMarkus Heidelberg
2010-04-02builtin/commit: fix duplicated sentence in a commentMarkus Heidelberg
2010-03-31Sync with 1.7.0.4Junio C Hamano
2010-03-30Merge branch 'maint'Junio C Hamano
2010-03-29Merge branch 'cc/cherry-pick-ff'Junio C Hamano
2010-03-29Merge branch 'sb/notes-parse-opt'Junio C Hamano
2010-03-29Merge branch 'maint'Junio C Hamano
2010-03-24Merge branch 'tr/notes-display'Junio C Hamano
2010-03-24Merge branch 'pb/log-first-parent-p-m'Junio C Hamano
2010-03-21ls: remove redundant logicErik Faye-Lund
2010-03-21cherry: support --abbrev optionErik Faye-Lund
2010-03-21cherry-pick, revert: add a label for ancestorJonathan Nieder
2010-03-21revert: clarify label on conflict hunksJonathan Nieder
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-15grep: enable threading for context line printingRené Scharfe
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