summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | | | Merge branch 'jk/skip-prefix'Junio C Hamano2014-07-161-9/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | tag: use skip_prefix instead of magic numbersjk/skip-prefixJeff King2014-07-101-9/+5
* | | | | | | | | | | Merge branch 'jk/strip-suffix'Junio C Hamano2014-07-164-28/+26
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | verify-pack: use strbuf_strip_suffixJeff King2014-06-301-4/+3
| * | | | | | | | | | | index-pack: use strip_suffix to avoid magic numbersJeff King2014-06-301-15/+14
| * | | | | | | | | | | use strip_suffix instead of ends_with in simple casesJeff King2014-06-302-9/+9
| * | | | | | | | | | | replace has_extension with ends_withJeff King2014-06-302-4/+4
* | | | | | | | | | | | Merge branch 'jk/replace-edit-raw'Junio C Hamano2014-07-161-10/+21
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | replace: add a --raw mode for --editjk/replace-edit-rawJeff King2014-06-251-10/+21
* | | | | | | | | | | | | Merge branch 'cc/replace-edit'Junio C Hamano2014-07-161-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | replace: use argv_array in export_objectcc/replace-editJeff King2014-06-251-3/+5
| * | | | | | | | | | | | avoid double close of descriptors handed to run_commandJeff King2014-06-251-2/+0
| * | | | | | | | | | | | replace: replace spaces with tabs in indentationJeff King2014-06-251-3/+3
* | | | | | | | | | | | | Merge branch 'nd/split-index'Junio C Hamano2014-07-1614-77/+98
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | read-tree: note about dropping split-index mode or index versionNguyễn Thái Ngọc Duy2014-06-131-0/+9
| * | | | | | | | | | | | | rev-parse: add --shared-index-path to get shared index pathNguyễn Thái Ngọc Duy2014-06-131-0/+10
| * | | | | | | | | | | | | update-index: new options to enable/disable split index modeNguyễn Thái Ngọc Duy2014-06-131-0/+18
| * | | | | | | | | | | | | read-cache: mark updated entries for split indexNguyễn Thái Ngọc Duy2014-06-131-0/+2
| * | | | | | | | | | | | | entry.c: update cache_changed if refresh_cache is set in checkout_entry()Nguyễn Thái Ngọc Duy2014-06-133-3/+7
| * | | | | | | | | | | | | cache-tree: mark istate->cache_changed on prime_cache_tree()Nguyễn Thái Ngọc Duy2014-06-132-2/+2
| * | | | | | | | | | | | | cache-tree: mark istate->cache_changed on cache tree invalidationNguyễn Thái Ngọc Duy2014-06-132-3/+3
| * | | | | | | | | | | | | update-index: be specific what part of the index has changedNguyễn Thái Ngọc Duy2014-06-131-3/+3
| * | | | | | | | | | | | | read-cache: be specific what part of the index has changedNguyễn Thái Ngọc Duy2014-06-131-3/+3
| * | | | | | | | | | | | | read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy2014-06-1312-66/+44
* | | | | | | | | | | | | | Merge branch 'mg/verify-commit'Junio C Hamano2014-07-102-4/+94
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status