summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mg/use-default-abbrev-length-in-rev-list'Junio C Hamano2010-04-031-1/+1
* Merge branch 'jn/merge-diff3-label'Junio C Hamano2010-04-033-42/+70
|\
| * cherry-pick, revert: add a label for ancestorJonathan Nieder2010-03-201-1/+4
| * revert: clarify label on conflict hunksJonathan Nieder2010-03-201-39/+62
| * checkout -m --conflict=diff3: add a label for ancestorJonathan Nieder2010-03-201-0/+1
| * checkout --conflict=diff3: add a label for ancestorJonathan Nieder2010-03-201-1/+1
| * ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder2010-03-201-1/+1
| * merge-file --diff3: add a label for ancestorJonathan Nieder2010-03-201-0/+1
| * xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder2010-03-201-2/+3
* | Merge branch 'ef/cherry-abbrev'Junio C Hamano2010-04-033-27/+25
|\ \
| * | ls: remove redundant logicErik Faye-Lund2010-03-212-9/+4
| * | cherry: support --abbrev optionErik Faye-Lund2010-03-211-18/+21
| |/
* | Merge branch 'rs/threaded-grep-context'Junio C Hamano2010-04-031-2/+13
|\ \
| * | grep: enable threading for context line printingRené Scharfe2010-03-151-2/+13
* | | builtin/commit: remove unnecessary variable definitionMarkus Heidelberg2010-04-021-1/+1
* | | builtin/commit: fix duplicated sentence in a commentMarkus Heidelberg2010-04-021-2/+2
* | | Sync with 1.7.0.4Junio C Hamano2010-03-311-1/+2
* | | Merge branch 'maint'Junio C Hamano2010-03-291-1/+8
* | | Merge branch 'cc/cherry-pick-ff'Junio C Hamano2010-03-282-5/+43
* | | Merge branch 'sb/notes-parse-opt'Junio C Hamano2010-03-281-159/+371
* | | Merge branch 'maint'Junio C Hamano2010-03-281-1/+1
* | | Merge branch 'tr/notes-display'Junio C Hamano2010-03-243-1/+246
* | | Merge branch 'pb/log-first-parent-p-m'Junio C Hamano2010-03-242-15/+52
| |/ |/|
* | Merge branch 'ml/color-grep'Junio C Hamano2010-03-201-8/+28
* | Merge branch 'cc/reset-keep'Junio C Hamano2010-03-201-9/+38
* | Merge branch 'bg/apply-fix-blank-at-eof'Junio C Hamano2010-03-201-40/+145
* | Merge branch 'bw/union-merge-refactor'Junio C Hamano2010-03-201-9/+14
* | Merge branch 'maint'Junio C Hamano2010-03-201-6/+5
|/
* Merge branch 'sd/format-patch-to'Junio C Hamano2010-03-151-39/+61
* Merge branch 'tc/transport-verbosity'Junio C Hamano2010-03-153-20/+17
* Merge branch 'ld/push-porcelain'Junio C Hamano2010-03-152-3/+7
* Merge branch 'jh/notes'Junio C Hamano2010-03-151-0/+455
* Merge branch 'maint'Junio C Hamano2010-03-131-1/+1
* Merge branch 'sd/init-template'Junio C Hamano2010-03-101-0/+14
* Merge branch 'sh/am-keep-cr'Junio C Hamano2010-03-101-1/+1
* Merge branch 'cp/add-u-pathspec'Junio C Hamano2010-03-101-9/+29
* Merge branch 'lt/deepen-builtin-source'Junio C Hamano2010-03-1019-328/+174
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-2289-0/+42160