aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* tag -v: use RUN_GIT_CMD to run verify-tagJonathan Nieder2010-04-17
* Merge branch 'maint'Junio C Hamano2010-04-09
* Merge branch 'jn/mailinfo-scissors'Junio C Hamano2010-04-07
|\
| * Teach mailinfo %< as an alternative scissors markJonathan Nieder2010-04-04
* | Merge branch 'sb/fmt-merge-msg'Junio C Hamano2010-04-06
|\ \
| * | fmt-merge-msg: hide summary optionStephen Boyd2010-03-24
| * | fmt-merge-msg: remove custom string_list implementationStephen Boyd2010-03-24
| * | fmt-merge-msg: use pretty.c routinesStephen Boyd2010-03-24
| * | fmt-merge-msg: be quiet if nothing to mergeStephen Boyd2010-03-24
* | | Merge branch 'ef/maint-empty-commit-log'Junio C Hamano2010-04-06
* | | Merge branch 'mg/use-default-abbrev-length-in-rev-list'Junio C Hamano2010-04-03
* | | Merge branch 'jn/merge-diff3-label'Junio C Hamano2010-04-03
|\ \ \
| * | | cherry-pick, revert: add a label for ancestorJonathan Nieder2010-03-20
| * | | revert: clarify label on conflict hunksJonathan Nieder2010-03-20
| * | | checkout -m --conflict=diff3: add a label for ancestorJonathan Nieder2010-03-20
| * | | checkout --conflict=diff3: add a label for ancestorJonathan Nieder2010-03-20
| * | | ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder2010-03-20
| * | | merge-file --diff3: add a label for ancestorJonathan Nieder2010-03-20
| * | | xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder2010-03-20
* | | | Merge branch 'ef/cherry-abbrev'Junio C Hamano2010-04-03
|\ \ \ \
| * | | | ls: remove redundant logicErik Faye-Lund2010-03-21
| * | | | cherry: support --abbrev optionErik Faye-Lund2010-03-21
| |/ / /
* | | | Merge branch 'rs/threaded-grep-context'Junio C Hamano2010-04-03
|\ \ \ \ | |_|_|/ |/| | |
| * | | grep: enable threading for context line printingRené Scharfe2010-03-15
* | | | builtin/commit: remove unnecessary variable definitionMarkus Heidelberg2010-04-02
* | | | builtin/commit: fix duplicated sentence in a commentMarkus Heidelberg2010-04-02
* | | | Sync with 1.7.0.4Junio C Hamano2010-03-31
* | | | Merge branch 'maint'Junio C Hamano2010-03-29
* | | | Merge branch 'cc/cherry-pick-ff'Junio C Hamano2010-03-28
* | | | Merge branch 'sb/notes-parse-opt'Junio C Hamano2010-03-28
* | | | Merge branch 'maint'Junio C Hamano2010-03-28
| |_|/ |/| |
* | | Merge branch 'tr/notes-display'Junio C Hamano2010-03-24
* | | Merge branch 'pb/log-first-parent-p-m'Junio C Hamano2010-03-24
| |/ |/|
* | Merge branch 'ml/color-grep'Junio C Hamano2010-03-20
* | Merge branch 'cc/reset-keep'Junio C Hamano2010-03-20
* | Merge branch 'bg/apply-fix-blank-at-eof'Junio C Hamano2010-03-20
* | Merge branch 'bw/union-merge-refactor'Junio C Hamano2010-03-20
* | Merge branch 'maint'Junio C Hamano2010-03-20
|/
* Merge branch 'sd/format-patch-to'Junio C Hamano2010-03-15
* Merge branch 'tc/transport-verbosity'Junio C Hamano2010-03-15
* Merge branch 'ld/push-porcelain'Junio C Hamano2010-03-15
* Merge branch 'jh/notes'Junio C Hamano2010-03-15
* Merge branch 'maint'Junio C Hamano2010-03-13
* Merge branch 'sd/init-template'Junio C Hamano2010-03-10
* Merge branch 'sh/am-keep-cr'Junio C Hamano2010-03-10
* Merge branch 'cp/add-u-pathspec'Junio C Hamano2010-03-10
* Merge branch 'lt/deepen-builtin-source'Junio C Hamano2010-03-10
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-22