summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mr/mark-i18n-log-rerere'Junio C Hamano2014-09-191-5/+5
|\
| * builtin/log.c: mark strings for translationmr/mark-i18n-log-rerereMatthias Ruester2014-09-151-5/+5
* | Merge branch 'ta/config-add-to-empty-or-true-fix'Junio C Hamano2014-09-191-1/+2
|\ \
| * | config: avoid a funny sentinel value "a^"ta/config-add-to-empty-or-true-fixJeff King2014-09-111-1/+2
| * | make config --add behave correctly for empty and NULL valuesTanay Abhra2014-08-181-1/+1
* | | Merge branch 'as/calloc-takes-nmemb-then-size'Junio C Hamano2014-09-191-1/+1
|\ \ \
| * | | calloc() and xcalloc() takes nmemb and then sizeas/calloc-takes-nmemb-then-sizeArjun Sreedharan2014-09-031-1/+1
| | |/ | |/|
* | | Merge branch 'rs/merge-tree-simplify'Junio C Hamano2014-09-191-12/+6
|\ \ \
| * | | merge-tree: remove unused df_conflict argumentsrs/merge-tree-simplifyRené Scharfe2014-09-021-12/+6
| |/ /
* | | Merge branch 'da/styles'Junio C Hamano2014-09-191-3/+4
|\ \ \
| * | | stylefix: asterisks stick to the variable, not the typeda/stylesDavid Aguilar2014-09-021-3/+4
| |/ /
* | | Merge branch 'ah/grammofix'Junio C Hamano2014-09-195-6/+6
|\ \ \
| * | | grammofix in user-facing messagesah/grammofixAlex Henrie2014-09-025-6/+6
| |/ /
* | | Merge branch 'jk/index-pack-threading-races'Junio C Hamano2014-09-191-2/+31
|\ \ \
| * | | index-pack: fix race condition with duplicate basesjk/index-pack-threading-racesJeff King2014-08-291-2/+31
* | | | Merge branch 'jk/commit-author-parsing'Junio C Hamano2014-09-191-41/+48
|\ \ \ \
| * | | | determine_author_info(): copy getenv outputjk/commit-author-parsingJeff King2014-08-291-13/+27
| * | | | determine_author_info(): reuse parsing functionsJeff King2014-08-291-28/+21
| * | | | date: use strbufs in date-formatting functionsJeff King2014-08-271-10/+10
* | | | | Merge branch 'bb/date-iso-strict'Junio C Hamano2014-09-191-0/+3
|\ \ \ \ \
| * | | | | pretty: provide a strict ISO 8601 date formatbb/date-iso-strictBeat Bolli2014-08-291-0/+3
| |/ / / /
* | | | | Merge branch 'jk/fast-export-anonymize'Junio C Hamano2014-09-191-11/+289
|\ \ \ \ \
| * | | | | teach fast-export an --anonymize optionJeff King2014-08-271-11/+289
| |/ / / /
* | | | | Merge branch 'jk/send-pack-many-refspecs'Junio C Hamano2014-09-191-0/+27
|\ \ \ \ \
| * | | | | send-pack: take refspecs over stdinjk/send-pack-many-refspecsJeff King2014-08-261-0/+27
| | |_|/ / | |/| | |
* | | | | Merge branch 'nd/fetch-pass-quiet-to-gc-child-process'Junio C Hamano2014-09-111-4/+6
|\ \ \ \ \
| * | | | | fetch: silence git-gc if --quiet is givennd/fetch-pass-quiet-to-gc-child-processNguyễn Thái Ngọc Duy2014-08-181-0/+2
| * | | | | fetch: convert argv_gc_auto to struct argv_arrayNguyễn Thái Ngọc Duy2014-08-181-4/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'dt/cache-tree-repair'Junio C Hamano2014-09-112-1/+19
|\ \ \ \ \
| * | | | | cache-tree: Write updated cache-tree after commitDavid Turner2014-07-141-1/+17
| * | | | | cache-tree: create/update cache-tree on checkoutDavid Turner2014-07-071-0/+8
* | | | | | Merge branch 'rs/ref-transaction-1'Junio C Hamano2014-09-115-51/+81
|\ \ \ \ \ \
| * | | | | | update-ref --stdin: pass transaction around explicitlyrs/ref-transaction-1Jonathan Nieder2014-09-031-12/+15
| * | | | | | update-ref --stdin: narrow scope of err strbufJonathan Nieder2014-09-031-1/+10
| * | | | | | receive-pack.c: use a reference transaction for updating the refsRonnie Sahlberg2014-09-031-9/+16
| * | | | | | commit.c: use ref transactions for updatesRonnie Sahlberg2014-09-031-13/+12
| * | | | | | replace.c: use the ref transaction functions for updatesRonnie Sahlberg2014-09-031-6/+8
| * | | | | | tag.c: use ref transactions when doing updatesRonnie Sahlberg2014-09-031-6/+10
| * | | | | | refs.c: make ref_transaction_begin take an err argumentRonnie Sahlberg2014-09-031-1/+4
| * | | | | | refs.c: update ref_transaction_delete to check for error and return statusRonnie Sahlberg2014-09-031-2/+3
| * | | | | | refs.c: change ref_transaction_create to do error checking and return statusRonnie Sahlberg2014-09-031-1/+3
* | | | | | | Merge branch 'nd/mv-code-cleaning'Junio C Hamano2014-09-111-88/+86
|\ \ \ \ \ \ \
| * | | | | | | mv: no SP between function name and the first opening parenthesend/mv-code-cleaningNguyễn Thái Ngọc Duy2014-09-031-2/+2
| * | | | | | | mv: combine two if(s)Nguyễn Thái Ngọc Duy2014-09-031-4/+3
| * | | | | | | mv: unindent one level for directory move codeNguyễn Thái Ngọc Duy2014-09-031-28/+21
| * | | | | | | mv: move index search code outNguyễn Thái Ngọc Duy2014-09-031-17/+25
| * | | | | | | mv: remove an "if" that's always trueNguyễn Thái Ngọc Duy2014-09-031-15/+7
| * | | | | | | mv: split submodule move preparation code outNguyễn Thái Ngọc Duy2014-09-031-14/+22
| * | | | | | | mv: flatten error handling code blockNguyễn Thái Ngọc Duy2014-08-111-18/+16
| * | | | | | | mv: mark strings for translationsNguyễn Thái Ngọc Duy2014-08-111-1/+1
| | |_|/ / / / | |/| | | | |