summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* msvc: Fix some "expr evaluates to function" compiler warningsRamsay Jones2010-06-241-1/+1
* Merge branch 'cc/maint-commit-reflog-msg' into maintJunio C Hamano2010-06-221-4/+9
|\
| * commit: use value of GIT_REFLOG_ACTION env variable as reflog messageChristian Couder2010-06-131-4/+9
* | Merge branch 'jk/maint-advice-empty-amend' into maintJunio C Hamano2010-06-221-0/+7
|\ \
| * | commit: give advice on empty amendJeff King2010-06-111-0/+7
| |/
* | Merge branch 'tc/commit-abbrev-fix' into maintJunio C Hamano2010-06-221-6/+4
* | Merge branch 'cb/ls-files-cdup' into maintJunio C Hamano2010-06-221-34/+41
|\ \
| * | ls-files: allow relative pathspecClemens Buchacher2010-06-051-34/+41
* | | Merge branch 'tc/merge-m-log' into maintJunio C Hamano2010-06-222-36/+60
|\ \ \
| * | | merge: --log appends shortlog to message if specifiedTay Ray Chuan2010-05-102-7/+14
| * | | fmt-merge-msg: add function to append shortlog onlyTay Ray Chuan2010-05-101-4/+9
| * | | fmt-merge-msg: refactor merge title formattingTay Ray Chuan2010-05-101-29/+36
| * | | fmt-merge-msg: minor refactor of fmt_merge_msg()Tay Ray Chuan2010-05-101-1/+6
| * | | merge: rename variableTay Ray Chuan2010-05-101-3/+3
| * | | merge: update commentTay Ray Chuan2010-05-101-1/+1
* | | | Merge branch 'ph/clone-message-reword' into maintJunio C Hamano2010-06-221-1/+2
|\ \ \ \
| * | | | clone: reword messages to match the end-user perceptionPete Harlan2010-05-091-1/+2
* | | | | Merge branch 'jn/maint-amend-missing-name' into maintJunio C Hamano2010-06-221-7/+13
|\ \ \ \ \
| * | | | | commit --amend: cope with missing display nameJonathan Nieder2010-05-041-7/+13
| |/ / / /
* | | | | Merge branch 'pc/remove-warn' into maintJunio C Hamano2010-06-221-5/+1
|\ \ \ \ \
| * | | | | Introduce remove_or_warn functionPeter Collingbourne2010-03-281-5/+1
* | | | | | Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano2010-06-214-4/+4
* | | | | | Merge branch 'bg/apply-blank-trailing-context' into maintJunio C Hamano2010-06-211-6/+6
* | | | | | 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