aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jk/misc-fixes-maint'Junio C Hamano2014-07-28
|\
| * apply: avoid possible bogus pointerJeff King2014-07-24
| * free ref string returned by dwim_refJeff King2014-07-24
| * receive-pack: don't copy "dir" parameterJeff King2014-07-24
* | Merge branch 'cc/replace-graft'Junio C Hamano2014-07-27
|\ \
| * | replace: check mergetags when using --graftChristian Couder2014-07-21
| * | replace: remove signature when using --graftChristian Couder2014-07-21
| * | replace: add --graft optionChristian Couder2014-07-21
* | | Merge branch 'ta/string-list-init'Junio C Hamano2014-07-23
|\ \ \
| * | | replace memset with string-list initializersTanay Abhra2014-07-21
* | | | Merge branch 'mb/local-clone-after-applying-insteadof'Junio C Hamano2014-07-23
|\ \ \ \
| * | | | use local cloning if insteadOf makes a local URLMichael Barabanov2014-07-17
* | | | | Merge branch 'jk/tag-sort'Junio C Hamano2014-07-23
|\ \ \ \ \
| * | | | | tag: support configuring --sort via .gitconfigJacob Keller2014-07-17
* | | | | | Merge branch 'rs/code-cleaning'Junio C Hamano2014-07-22
|\ \ \ \ \ \
| * | | | | | use commit_list_count() to count the members of commit_listsRené Scharfe2014-07-17
| * | | | | | strbuf: use strbuf_addstr() for adding C stringsRené Scharfe2014-07-17
* | | | | | | Merge branch 'jk/alloc-commit-id'Junio C Hamano2014-07-22
|\ \ \ \ \ \ \
| * | | | | | | diff-tree: avoid lookup_unknown_objectJeff King2014-07-13
| * | | | | | | move setting of object->type to alloc_* functionsJeff King2014-07-13
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'kb/perf-trace'Junio C Hamano2014-07-22
|\ \ \ \ \ \ \
| * | | | | | | trace: improve trace performanceKarsten Blees2014-07-13
* | | | | | | | Merge branch 'maint'Junio C Hamano2014-07-21
|\ \ \ \ \ \ \ \
| * | | | | | | | use xmemdupz() to allocate copies of strings given by start and lengthRené Scharfe2014-07-21
| * | | | | | | | use xcalloc() to allocate zero-initialized memoryRené Scharfe2014-07-21
* | | | | | | | | Merge branch 'rs/unify-is-branch'Junio C Hamano2014-07-21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | refs.c: add a public is_branch functionRonnie Sahlberg2014-07-16
| |/ / / / / / / /
* | | | | | | | | Merge branch 'kb/hashmap-updates'Junio C Hamano2014-07-21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | hashmap: add simplified hashmap_get_from_hash() APIKarsten Blees2014-07-07
| * | | | | | | | | hashmap: factor out getting a hash code from a SHA1Karsten Blees2014-07-07
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs/ref-transaction-0'Junio C Hamano2014-07-21
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | refs.c: change ref_transaction_update() to do error checking and return statusRonnie Sahlberg2014-07-14
| * | | | | | | | refs.c: remove the onerr argument to ref_transaction_commitRonnie Sahlberg2014-07-14
| * | | | | | | | update-ref: use err argument to get error from ref_transaction_commitRonnie Sahlberg2014-07-14
| * | | | | | | | refs.c: add an err argument to repack_without_refsRonnie Sahlberg2014-07-14
| * | | | | | | | refs.c: add a strbuf argument to ref_transaction_commit for error loggingRonnie Sahlberg2014-07-14
| * | | | | | | | refs.c: ref_transaction_commit should not free the transactionRonnie Sahlberg2014-07-14
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Sync with 2.0.2Junio C Hamano2014-07-16
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'jc/fix-clone-single-starting-at-a-tag' into maintJunio C Hamano2014-07-16
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/commit-buffer-length' into maintJunio C Hamano2014-07-16
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'maint-1.9' into maintJunio C Hamano2014-07-16
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-07-16
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | annotate: use argv_arrayRené Scharfe2014-07-16
| * | | | | | | | | | | Merge branch 'jk/repack-pack-keep-objects' into maintJunio C Hamano2014-07-10
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/code-cleaning'Junio C Hamano2014-07-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | merge: simplify merge_trivial() by using commit_list_append()René Scharfe2014-07-10
| * | | | | | | | | | | | use strbuf_addbuf for adding strbufsRené Scharfe2014-07-10
* | | | | | | | | | | | | Merge branch 'jk/skip-prefix'Junio C Hamano2014-07-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | tag: use skip_prefix instead of magic numbersJeff King2014-07-10
* | | | | | | | | | | | | Merge branch 'jk/strip-suffix'Junio C Hamano2014-07-16
|\ \ \ \ \ \ \ \ \ \ \ \ \