summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | apply: free patch->{def,old,new}_name fieldsJunio C Hamano2012-03-271-26/+39
| * | | | | apply: rename free_patch() to free_patch_list()Junio C Hamano2012-03-271-14/+19
| * | | | | apply: do not leak patches and fragmentsJared Hance2012-03-071-4/+23
* | | | | | Merge branch 'rl/show-empty-prefix'Junio C Hamano2012-04-231-0/+2
|\ \ \ \ \ \
| * | | | | | rev-parse --show-prefix: add in trailing newlineRoss Lagerwall2012-04-101-0/+2
* | | | | | | Merge branch 'ms/remote-usage-string'Junio C Hamano2012-04-231-2/+2
|\ \ \ \ \ \ \
| * | | | | | | remote: update builtin usageMichael Schubert2012-04-091-2/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'ct/advise-push-default'Junio C Hamano2012-04-201-5/+55
|\ \ \ \ \ \ \
| * | | | | | | push: Provide situational hints for non-fast-forward errorsChristopher Tiwald2012-03-191-5/+55
* | | | | | | | Merge branch 'jc/push-upstream-sanity'Junio C Hamano2012-04-201-8/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | push: error out when the "upstream" semantics does not make senseJunio C Hamano2012-04-051-8/+18
* | | | | | | | | Merge branch 'jc/fmt-merge-msg-people'Junio C Hamano2012-04-201-4/+110
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fmt-merge-msg: show those involved in a merged seriesjc/fmt-merge-msg-peopleJunio C Hamano2012-03-131-4/+110
* | | | | | | | | | Merge branch 'jc/commit-unedited-template'Junio C Hamano2012-04-161-19/+43
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | commit: rephrase the error when user did not touch templated log messageJunio C Hamano2012-03-301-19/+41
| * | | | | | | | | | commit: do not trigger bogus "has templated message edited" checkJunio C Hamano2012-03-301-0/+2
* | | | | | | | | | | Merge branch 'jk/branch-quiet'Junio C Hamano2012-04-162-6/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | teach "git branch" a --quiet optionjk/branch-quietJeff King2012-03-261-6/+10
| * | | | | | | | | | | checkout: suppress tracking message with "-q"Jeff King2012-03-262-1/+2
* | | | | | | | | | | | Merge branch 'jk/diff-no-rename-empty'Junio C Hamano2012-04-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | drop casts from users EMPTY_TREE_SHA1_BINJeff King2012-03-231-1/+1
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jc/commit-hook-authorship'Junio C Hamano2012-04-151-3/+19
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | commit: pass author/committer info to hooksjc/commit-hook-authorshipJunio C Hamano2012-03-111-3/+19
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'nd/stream-more'Junio C Hamano2012-04-154-20/+48
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | update-server-info: respect core.bigfilethresholdnd/stream-moreNguyễn Thái Ngọc Duy2012-03-071-0/+1
| * | | | | | | | | | | fsck: use streaming API for writing lost-found blobsNguyễn Thái Ngọc Duy2012-03-071-6/+2
| * | | | | | | | | | | show: use streaming API for showing blobsNguyễn Thái Ngọc Duy2012-03-071-14/+20
| * | | | | | | | | | | cat-file: use streaming API to print blobsNguyễn Thái Ngọc Duy2012-03-071-0/+25
* | | | | | | | | | | | Sync with 1.7.9.6Junio C Hamano2012-04-021-4/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'jc/maint-merge-autoedit' into maintJunio C Hamano2012-04-021-1/+28
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | merge: backport GIT_MERGE_AUTOEDIT supportjc/maint-merge-autoeditJunio C Hamano2012-03-201-1/+28
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'maint-1.7.8' into maintJunio C Hamano2012-03-201-5/+4
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | / / / | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | Merge branch 'jc/advise-i18n' into maint-1.7.8Junio C Hamano2012-03-201-5/+4
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
* | | | | | | | | | config: remove useless assignmentRené Scharfe2012-03-281-2/+0
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'az/verify-tag-use-gpg-config'Junio C Hamano2012-03-121-1/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | verify-tag: Parse GPG configuration options.az/verify-tag-use-gpg-configAlex Zepeda2012-03-081-1/+9
| | |_|_|_|/ / / / | |/| | | | | | |
View Lorry Controller Status