summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/maint-status-porcelain-z-b' into HEADJeff King2012-05-081-68/+67
|\
| * status: respect "-b" for porcelain formatJeff King2012-05-081-5/+4
| * status: refactor null_termination optionJeff King2012-05-081-9/+8
| * commit: refactor option parsingJeff King2012-05-081-58/+59
| * Merge branch 'jc/merge-reduce-parents-early' into maintJunio C Hamano2012-05-032-63/+207
| |\
| * \ Merge branch 'cb/cherry-pick-rev-path-confusion' into maintJunio C Hamano2012-05-031-1/+4
| |\ \
| * \ \ Merge branch 'mb/fetch-call-a-non-branch-a-ref' into maintJunio C Hamano2012-05-031-4/+13
| |\ \ \
| * \ \ \ Merge branch 'it/fetch-pack-many-refs' into maintJunio C Hamano2012-05-011-1/+41
| |\ \ \ \
| * \ \ \ \ Merge branch 'jl/maint-submodule-recurse-fetch' into maintJunio C Hamano2012-05-011-3/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/maint-blame-minimal' into maintJunio C Hamano2012-05-011-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/push-upstream-sanity' into maintJunio C Hamano2012-04-261-8/+18
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/diff-no-rename-empty' into maintJunio C Hamano2012-04-261-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/commit-unedited-template' into maintJunio C Hamano2012-04-261-19/+43
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/commit-hook-authorship' into maintJunio C Hamano2012-04-261-3/+19
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-push-progress'Junio C Hamano2012-05-031-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | teach send-pack about --[no-]progressJeff King2012-05-011-2/+12
| * | | | | | | | | | | | send-pack: show progress when isatty(2)Jeff King2012-05-011-0/+3
* | | | | | | | | | | | | Merge branch 'nd/columns'Junio C Hamano2012-05-035-8/+124
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | tag: add --columnNguyễn Thái Ngọc Duy2012-04-271-3/+24
| * | | | | | | | | | | | | status: add --columnNguyễn Thái Ngọc Duy2012-04-271-0/+7
| * | | | | | | | | | | | | branch: add --columnNguyễn Thái Ngọc Duy2012-04-271-4/+28
| * | | | | | | | | | | | | help: reuse print_columns() for help -aNguyễn Thái Ngọc Duy2012-04-271-1/+6
| * | | | | | | | | | | | | Add column layout skeleton and git-columnNguyễn Thái Ngọc Duy2012-04-271-0/+59
* | | | | | | | | | | | | | Merge branch 'pw/message-cleanup'Junio C Hamano2012-05-023-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | remove superfluous newlines in error messagesPete Wyckoff2012-04-303-4/+4
* | | | | | | | | | | | | | | Merge branch 'ab/i18n'Junio C Hamano2012-05-022-45/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-commit: remove lego in i18n messagesÆvar Arnfjörð Bjarmason2012-04-301-7/+6
| * | | | | | | | | | | | | | | git-commit: remove lego in i18n messagesÆvar Arnfjörð Bjarmason2012-04-301-29/+23
| * | | | | | | | | | | | | | | git-branch: remove lego in i18n messagesÆvar Arnfjörð Bjarmason2012-04-301-9/+15
* | | | | | | | | | | | | | | | Merge branch 'nd/i18n'Junio C Hamano2012-05-025-284/+326
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | help: replace underlining "help -a" headers using hyphens with a blank lineNguyễn Thái Ngọc Duy2012-04-251-1/+1
| * | | | | | | | | | | | | | | | i18n: index-pack: mark strings for translationNguyễn Thái Ngọc Duy2012-04-241-57/+68
| * | | | | | | | | | | | | | | | i18n: apply: update say_patch_name to give translators complete sentenceNguyễn Thái Ngọc Duy2012-04-241-12/+20
| * | | | | | | | | | | | | | | | i18n: apply: mark strings for translationNguyễn Thái Ngọc Duy2012-04-241-83/+91
| * | | | | | | | | | | | | | | | i18n: remote: mark strings for translationNguyễn Thái Ngọc Duy2012-04-241-106/+121
| * | | | | | | | | | | | | | | | i18n: make warn_dangling_symref() automatically append \nNguyễn Thái Ngọc Duy2012-04-242-4/+4
| * | | | | | | | | | | | | | | | i18n: help: mark strings for translationNguyễn Thái Ngọc Duy2012-04-241-24/+24
* | | | | | | | | | | | | | | | | Merge branch 'mm/simple-push'Junio C Hamano2012-05-021-2/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | push: introduce new push.default mode "simple"Matthieu Moy2012-04-241-2/+45
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'jc/index-v4'Junio C Hamano2012-05-021-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | update-index: upgrade/downgrade on-disk index versionJunio C Hamano2012-04-041-0/+14
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'nh/empty-rebase'Junio C Hamano2012-04-301-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | git-cherry-pick: Add keep-redundant-commits optionNeil Horman2012-04-241-1/+7
| * | | | | | | | | | | | | | | git-cherry-pick: add allow-empty optionNeil Horman2012-04-111-0/+2
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'jk/repack-no-explode-objects-from-old-pack'Junio C Hamano2012-04-292-49/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | gc: use argv-array for sub-commandsJeff King2012-04-181-45/+33
| * | | | | | | | | | | | | | | gc: do not explode objects which will be immediately prunedJeff King2012-04-112-10/+38
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'jc/merge-reduce-parents-early'Junio C Hamano2012-04-272-63/+207
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | fmt-merge-msg: discard needless merge parentsJunio C Hamano2012-04-181-9/+119
| * | | | | | | | | | | | | | builtin/merge.c: reduce parents earlyJunio C Hamano2012-04-171-25/+40
View Lorry Controller Status