summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* builtin/log.c: mark strings for translationmr/mark-i18n-log-rerereMatthias Ruester2014-09-151-5/+5
* Merge branch 'jk/pack-shallow-always-without-bitmap'Junio C Hamano2014-08-261-0/+1
|\
| * pack-objects: turn off bitmaps when we see --shallow linesjk/pack-shallow-always-without-bitmapJeff King2014-08-121-0/+1
* | Merge branch 'jk/misc-fixes-maint'Junio C Hamano2014-07-284-3/+5
|\ \
| * | apply: avoid possible bogus pointerjk/misc-fixes-maintJeff King2014-07-241-1/+1
| * | free ref string returned by dwim_refJeff King2014-07-242-0/+2
| * | receive-pack: don't copy "dir" parameterJeff King2014-07-241-2/+2
* | | Merge branch 'cc/replace-graft'Junio C Hamano2014-07-271-1/+125
|\ \ \
| * | | replace: check mergetags when using --graftChristian Couder2014-07-211-0/+47
| * | | replace: remove signature when using --graftChristian Couder2014-07-211-0/+5
| * | | replace: add --graft optionChristian Couder2014-07-211-1/+73
* | | | Merge branch 'ta/string-list-init'Junio C Hamano2014-07-231-2/+1
|\ \ \ \
| * | | | replace memset with string-list initializersta/string-list-initTanay Abhra2014-07-211-2/+1
* | | | | Merge branch 'mb/local-clone-after-applying-insteadof'Junio C Hamano2014-07-231-12/+13
|\ \ \ \ \
| * | | | | use local cloning if insteadOf makes a local URLmb/local-clone-after-applying-insteadofMichael Barabanov2014-07-171-12/+13
* | | | | | Merge branch 'jk/tag-sort'Junio C Hamano2014-07-231-18/+50
|\ \ \ \ \ \
| * | | | | | tag: support configuring --sort via .gitconfigjk/tag-sortJacob Keller2014-07-171-18/+50
* | | | | | | Merge branch 'rs/code-cleaning'Junio C Hamano2014-07-223-19/+4
|\ \ \ \ \ \ \
| * | | | | | | use commit_list_count() to count the members of commit_listsRené Scharfe2014-07-172-18/+3
| * | | | | | | strbuf: use strbuf_addstr() for adding C stringsRené Scharfe2014-07-171-1/+1
* | | | | | | | Merge branch 'jk/alloc-commit-id'Junio C Hamano2014-07-222-4/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | diff-tree: avoid lookup_unknown_objectjk/alloc-commit-idJeff King2014-07-131-3/+1
| * | | | | | | | move setting of object->type to alloc_* functionsJeff King2014-07-131-1/+0
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'kb/perf-trace'Junio C Hamano2014-07-221-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | trace: improve trace performanceKarsten Blees2014-07-131-1/+1
* | | | | | | | | Merge branch 'maint'Junio C Hamano2014-07-214-11/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | use xmemdupz() to allocate copies of strings given by start and lengthRené Scharfe2014-07-212-7/+2
| * | | | | | | | | use xcalloc() to allocate zero-initialized memoryRené Scharfe2014-07-212-4/+2
* | | | | | | | | | Merge branch 'rs/unify-is-branch'Junio C Hamano2014-07-211-5/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | refs.c: add a public is_branch functionrs/unify-is-branchRonnie Sahlberg2014-07-161-5/+0
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'kb/hashmap-updates'Junio C Hamano2014-07-211-11/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | hashmap: add simplified hashmap_get_from_hash() APIKarsten Blees2014-07-071-3/+1
| * | | | | | | | | | hashmap: factor out getting a hash code from a SHA1Karsten Blees2014-07-071-9/+2
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rs/ref-transaction-0'Junio C Hamano2014-07-212-11/+14
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | refs.c: change ref_transaction_update() to do error checking and return statusrs/ref-transaction-0Ronnie Sahlberg2014-07-141-5/+7
| * | | | | | | | | refs.c: remove the onerr argument to ref_transaction_commitRonnie Sahlberg2014-07-141-2/+1
| * | | | | | | | | update-ref: use err argument to get error from ref_transaction_commitRonnie Sahlberg2014-07-141-5/+5
| * | | | | | | | | refs.c: add an err argument to repack_without_refsRonnie Sahlberg2014-07-141-2/+3
| * | | | | | | | | refs.c: add a strbuf argument to ref_transaction_commit for error loggingRonnie Sahlberg2014-07-141-1/+1
| * | | | | | | | | refs.c: ref_transaction_commit should not free the transactionRonnie Sahlberg2014-07-141-0/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Sync with 2.0.2Junio C Hamano2014-07-161-7/+5
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'jc/fix-clone-single-starting-at-a-tag' into maintJunio C Hamano2014-07-161-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/commit-buffer-length' into maintJunio C Hamano2014-07-1611-29/+47
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.9' into maintJunio C Hamano2014-07-161-7/+5
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-07-162-8/+6
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | annotate: use argv_arrayRené Scharfe2014-07-161-7/+5
| * | | | | | | | | | | | Merge branch 'jk/repack-pack-keep-objects' into maintJunio C Hamano2014-07-101-5/+9
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/code-cleaning'Junio C Hamano2014-07-162-7/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | merge: simplify merge_trivial() by using commit_list_append()René Scharfe2014-07-101-6/+4
| * | | | | | | | | | | | | use strbuf_addbuf for adding strbufsRené Scharfe2014-07-101-1/+1
View Lorry Controller Status