summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | builtin/merge.c: collect other parents earlyJunio C Hamano2012-04-171-13/+27
| * | | builtin/merge.c: remove "remoteheads" global variableJunio C Hamano2012-04-171-23/+28
* | | | Merge branch 'cb/cherry-pick-rev-path-confusion'Junio C Hamano2012-04-271-1/+4
|\ \ \ \
| * | | | cherry-pick: do not expect file argumentsClemens Buchacher2012-04-151-1/+4
| | |/ / | |/| |
* | | | Merge branch 'mb/fetch-call-a-non-branch-a-ref'Junio C Hamano2012-04-261-4/+13
|\ \ \ \
| * | | | fetch: describe new refs based on where it came fromMarc Branchaud2012-04-171-3/+11
| * | | | fetch: Give remote_ref to update_local_ref() as wellMarc Branchaud2012-04-171-1/+2
| | |/ / | |/| |
* | | | Merge branch 'cc/fix-missing-va-end-in-revert'Junio C Hamano2012-04-241-0/+1
|\ \ \ \
| * | | | revert: add missing va_endChristian Couder2012-04-211-0/+1
* | | | | Merge branch 'it/fetch-pack-many-refs'Junio C Hamano2012-04-241-1/+41
|\ \ \ \ \
| * | | | | fetch-pack: new --stdin option to read refs from stdinIvan Todoroski2012-04-021-1/+41
* | | | | | Merge branch 'hv/submodule-recurse-push'Junio C Hamano2012-04-241-1/+9
|\ \ \ \ \ \
| * | | | | | push: teach --recurse-submodules the on-demand optionHeiko Voigt2012-03-301-1/+9
* | | | | | | Merge branch 'jl/maint-submodule-recurse-fetch'Junio C Hamano2012-04-231-3/+3
|\ \ \ \ \ \ \
| * | | | | | | submodules: recursive fetch also checks new tags for submodule commitsJens Lehmann2012-04-141-3/+3
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jc/maint-blame-minimal'Junio C Hamano2012-04-231-0/+1
|\ \ \ \ \ \ \
| * | | | | | | blame: accept --need-minimalJunio C Hamano2012-04-111-0/+1
| * | | | | | | Merge branch 'tr/cache-tree' into maint-1.7.8Junio C Hamano2012-04-092-4/+10
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'jh/apply-free-patch'Junio C Hamano2012-04-231-41/+133
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | apply: document buffer ownership rules across functionsJunio C Hamano2012-04-111-2/+51
| * | | | | | | | | apply: tighten constness of line bufferJunio C Hamano2012-04-111-7/+7
| * | | | | | | | | apply: drop unused macroJunio C Hamano2012-04-111-1/+0
| * | | | | | | | | apply: free unused fragments for submodule patchJunio C Hamano2012-03-281-9/+15
| * | | | | | | | | apply: free patch->resultJunio C Hamano2012-03-271-0/+1
| * | | | | | | | | apply: release memory for fn_tableJunio C Hamano2012-03-271-1/+1