summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen2010-07-021-0/+3
* Merge branch 'cp/textconv-cat-file'Junio C Hamano2010-06-272-8/+38
|\
| * textconv: support for cat_fileClément Poulain2010-06-182-8/+38
* | Merge branch 'ab/blame-textconv'Junio C Hamano2010-06-271-13/+72
|\ \ | |/
| * textconv: support for blameAxel Bonnet2010-06-181-13/+72
* | Merge branch 'maint'Junio C Hamano2010-06-251-1/+1
|\ \
| * | 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
| |\ \
| * \ \ Merge branch 'jk/maint-advice-empty-amend' into maintJunio C Hamano2010-06-221-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
| |\ \ \ \
| * \ \ \ \ Merge branch 'tc/merge-m-log' into maintJunio C Hamano2010-06-222-36/+60
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ph/clone-message-reword' into maintJunio C Hamano2010-06-221-1/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jn/maint-amend-missing-name' into maintJunio C Hamano2010-06-221-7/+13
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'pc/remove-warn' into maintJunio C Hamano2010-06-221-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 'sb/format-patch-signature'Junio C Hamano2010-06-221-3/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | format-patch: Add a signature option (--signature)Stephen Boyd2010-06-161-3/+15
* | | | | | | | | | | Merge branch 'cc/cherry-pick-series'Junio C Hamano2010-06-221-41/+79
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | revert: allow cherry-picking more than one commitChristian Couder2010-06-021-10/+41
| * | | | | | | | | | | revert: change help_msg() to take no argumentChristian Couder2010-06-021-4/+4
| * | | | | | | | | | | revert: refactor code into a do_pick_commit() functionChristian Couder2010-06-021-19/+25
| * | | | | | | | | | | revert: use run_command_v_opt() instead of execv_git_cmd()Christian Couder2010-06-021-2/+9
| * | | | | | | | | | | revert: cleanup code for -x optionChristian Couder2010-06-021-7/+1
* | | | | | | | | | | | Merge branch 'cc/maint-commit-reflog-msg'Junio C Hamano2010-06-211-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'Junio C Hamano2010-06-211-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | commit: give advice on empty amendJeff King2010-06-111-0/+7
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'sm/branch-broken-ref'Junio C Hamano2010-06-211-6/+22
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | branch: don't fail listing branches if one of the commits wasn't foundSimo Melenius2010-06-071-1/+4
| * | | | | | | | | | | branch: exit status now reflects if branch listing finds an errorSimo Melenius2010-06-071-6/+19
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'tc/commit-abbrev-fix'Junio C Hamano2010-06-211-6/+4
* | | | | | | | | | | Merge branch 'tr/receive-pack-aliased-update-fix'Junio C Hamano2010-06-211-2/+2
* | | | | | | | | | | Merge branch 'gs/usage-to-stdout'Junio C Hamano2010-06-211-1/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | parseopt: wrap rev-parse --parseopt usage for eval consumptionThomas Rast2010-06-131-1/+2
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'gv/portable'Junio C Hamano2010-06-2112-25/+38
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | enums: omit trailing comma for portabilityGary V. Vaughan2010-05-317-12/+12
| * | | | | | | | | | | Rewrite dynamic structure initializations to runtime assignmentGary V. Vaughan2010-05-317-13/+26
* | | | | | | | | | | | Merge branch 'em/checkout-orphan'Junio C Hamano2010-06-211-3/+28
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | log_ref_setup: don't return stack-allocated arrayThomas Rast2010-06-121-2/+2
| * | | | | | | | | | | | checkout --orphan: respect -l option alwaysErick Mattos2010-06-031-3/+28
* | | | | | | | | | | | | Merge branch 'cb/ls-files-cdup'Junio C Hamano2010-06-181-34/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | ls-files: allow relative pathspecClemens Buchacher2010-06-051-34/+41
* | | | | | | | | | | | | Merge branch 'mg/status-b'Junio C Hamano2010-06-181-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Show branch information in short output of git statusDaniel Knittl-Frank2010-06-031-2/+6
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jn/remote-set-branches'Junio C Hamano2010-06-181-11/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add git remote set-branchesJonathan Nieder2010-05-191-11/+91
* | | | | | | | | | | | | | Merge branch 'rc/ls-remote-default'Junio C Hamano2010-06-181-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | ls-remote: print URL when no repo is specifiedTay Ray Chuan2010-05-111-1/+9