summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jn/shortlog' into maintJunio C Hamano2010-06-161-1/+2
* Merge branch 'np/index-pack-memsave' into maintJunio C Hamano2010-06-161-44/+45
* Merge branch 'sp/maint-describe-tiebreak-with-tagger-date' into maintJunio C Hamano2010-06-161-4/+45
* Merge branch 'np/malloc-threading' into maintJunio C Hamano2010-06-162-3/+12
* Merge branch 'mh/status-optionally-refresh' into maintJunio C Hamano2010-06-161-0/+9
|\
| * git status: refresh the index if possibleMarkus Heidelberg2010-04-021-0/+9
* | notes: Initialize variable to appease Sun StudioÆvar Arnfjörð Bjarmason2010-06-151-1/+1
* | Change C99 comments to old-style C commentsTor Arntsen2010-06-072-3/+3
* | show-branch: use DEFAULT_ABBREV instead of 7Tay Ray Chuan2010-05-251-1/+2
* | handle "git --bare init <dir>" properlyJeff King2010-05-101-1/+1
* | cherry-pick: do not dump core when iconv failsJonathan Nieder2010-05-081-2/+7
* | clone: quell the progress report from init and report on cloneJunio C Hamano2010-05-041-1/+5
* | Merge branch 'maint'Junio C Hamano2010-05-011-1/+1
* | Merge branch 'maint'Junio C Hamano2010-04-191-1/+1
* | Merge branch 'jg/auto-initialize-notes-with-percent-n-in-format'Junio C Hamano2010-04-181-1/+5
|\ \
| * | pretty: Initialize notes if %N is usedJohannes Gilger2010-04-131-1/+5
* | | tag -v: use RUN_GIT_CMD to run verify-tagJonathan Nieder2010-04-171-2/+2
|/ /
* | Merge branch 'maint'Junio C Hamano2010-04-093-9/+6
* | Merge branch 'jn/mailinfo-scissors'Junio C Hamano2010-04-071-1/+2
|\ \
| * | Teach mailinfo %< as an alternative scissors markJonathan Nieder2010-04-041-1/+2
| |/
* | Merge branch 'sb/fmt-merge-msg'Junio C Hamano2010-04-061-103/+56
|\ \
| * | fmt-merge-msg: hide summary optionStephen Boyd2010-03-241-1/+3
| * | fmt-merge-msg: remove custom string_list implementationStephen Boyd2010-03-241-83/+44
| * | fmt-merge-msg: use pretty.c routinesStephen Boyd2010-03-241-21/+8
| * | fmt-merge-msg: be quiet if nothing to mergeStephen Boyd2010-03-241-0/+3
* | | Merge branch 'ef/maint-empty-commit-log'Junio C Hamano2010-04-061-1/+4
* | | 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
View Lorry Controller Status