summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* difftool: don't assume that default sh is sanecb/mergetool-difftoolCharles Bailey2014-07-212-6/+12
* mergetool: don't require a work tree for --tool-helpCharles Bailey2014-07-211-1/+2
* Merge branch 'rs/unify-is-branch'Junio C Hamano2014-07-213-6/+3
|\
| * refs.c: add a public is_branch functionrs/unify-is-branchRonnie Sahlberg2014-07-163-6/+3
* | Merge branch 'kb/avoid-fchmod-for-now'Junio C Hamano2014-07-211-4/+4
|\ \
| * | config: use chmod() instead of fchmod()kb/avoid-fchmod-for-nowKarsten Blees2014-07-161-4/+4
* | | Merge branch 'sk/mingw-uni-fix'Junio C Hamano2014-07-214-77/+171
|\ \ \
| * | | Win32: Unicode file name support (dirent)sk/mingw-uni-fixKarsten Blees2014-07-152-21/+11
| * | | Win32: Unicode file name support (except dirent)Karsten Blees2014-07-152-56/+160
* | | | Merge branch 'ek/alt-odb-entry-fix'Junio C Hamano2014-07-212-4/+33
|\ \ \ \
| * | | | sha1_file: do not add own object directory as alternateek/alt-odb-entry-fixEphrim Khong2014-07-152-4/+33
* | | | | Merge branch 'kb/hashmap-updates'Junio C Hamano2014-07-2112-61/+159
|\ \ \ \ \
| * | | | | hashmap: add string interning APIkb/hashmap-updatesKarsten Blees2014-07-075-0/+88
| * | | | | hashmap: add simplified hashmap_get_from_hash() APIKarsten Blees2014-07-076-18/+31
| * | | | | hashmap: improve struct hashmap member documentationKarsten Blees2014-07-071-4/+12
| * | | | | hashmap: factor out getting a hash code from a SHA1Karsten Blees2014-07-078-40/+29
* | | | | | Merge branch 'jk/remote-curl-squelch-extra-errors'Junio C Hamano2014-07-211-8/+6
|\ \ \ \ \ \
| * | | | | | remote-curl: mark helper-protocol errors more clearlyjk/remote-curl-squelch-extra-errorsJeff King2014-07-101-4/+4
| * | | | | | remote-curl: use error instead of fprintf(stderr)Jeff King2014-07-101-5/+5
| * | | | | | remote-curl: do not complain on EOF from parent gitJeff King2014-07-101-2/+0
* | | | | | | Merge branch 'rs/ref-transaction-0'Junio C Hamano2014-07-216-100/+199
|\ \ \ \ \ \ \
| * | | | | | | refs.c: change ref_transaction_update() to do error checking and return statusrs/ref-transaction-0Ronnie Sahlberg2014-07-143-16/+28
| * | | | | | | refs.c: remove the onerr argument to ref_transaction_commitRonnie Sahlberg2014-07-143-19/+9
| * | | | | | | update-ref: use err argument to get error from ref_transaction_commitRonnie Sahlberg2014-07-141-5/+5
| * | | | | | | refs.c: make update_ref_write update a strbuf on failureRonnie Sahlberg2014-07-141-3/+6
| * | | | | | | refs.c: make ref_update_reject_duplicates take a strbuf argument for errorsRonnie Sahlberg2014-07-141-1/+5
| * | | | | | | refs.c: log_ref_write should try to return meaningful errnoRonnie Sahlberg2014-07-141-5/+23
| * | | | | | | refs.c: make resolve_ref_unsafe set errno to something meaningful on errorRonnie Sahlberg2014-07-142-5/+16
| * | | | | | | refs.c: commit_packed_refs to return a meaningful errno on failureRonnie Sahlberg2014-07-142-1/+10
| * | | | | | | refs.c: make remove_empty_directories always set errno to something saneRonnie Sahlberg2014-07-141-1/+4
| * | | | | | | refs.c: verify_lock should set errno to something meaningfulRonnie Sahlberg2014-07-142-1/+9
| * | | | | | | refs.c: make sure log_ref_setup returns a meaningful errnoRonnie Sahlberg2014-07-142-9/+22
| * | | | | | | refs.c: add an err argument to repack_without_refsRonnie Sahlberg2014-07-143-8/+19
| * | | | | | | lockfile.c: make lock_file return a meaningful errno on failureiRonnie Sahlberg2014-07-143-5/+14
| * | | | | | | lockfile.c: add a new public function unable_to_lock_messageRonnie Sahlberg2014-07-142-10/+14
| * | | | | | | refs.c: add a strbuf argument to ref_transaction_commit for error loggingRonnie Sahlberg2014-07-143-3/+10
| * | | | | | | refs.c: allow passing NULL to ref_transaction_freeRonnie Sahlberg2014-07-141-0/+3
| * | | | | | | refs.c: constify the sha arguments for ref_transaction_create|delete|updateRonnie Sahlberg2014-07-142-6/+8
| * | | | | | | refs.c: ref_transaction_commit should not free the transactionRonnie Sahlberg2014-07-143-4/+3
| * | | | | | | refs.c: remove ref_transaction_rollbackRonnie Sahlberg2014-07-142-15/+8
* | | | | | | | Merge branch 'jl/submodule-tests'Junio C Hamano2014-07-2114-0/+974
|\ \ \ \ \ \ \ \
| * | | | | | | | revert: add t3513 for submodule updatesjl/submodule-testsJens Lehmann2014-07-141-0/+32
| * | | | | | | | stash: add t3906 for submodule updatesJens Lehmann2014-07-142-5/+42
| * | | | | | | | am: add t4255 for submodule updatesJens Lehmann2014-07-141-0/+21
| * | | | | | | | cherry-pick: add t3512 for submodule updatesJens Lehmann2014-07-142-3/+25
| * | | | | | | | pull: add t5572 for submodule updatesJens Lehmann2014-07-141-0/+45
| * | | | | | | | rebase: add t3426 for submodule updatesJens Lehmann2014-07-141-0/+46
| * | | | | | | | merge: add t7613 for submodule updatesJens Lehmann2014-07-142-3/+40
| * | | | | | | | bisect: add t6041 for submodule updatesJens Lehmann2014-07-141-0/+32
| * | | | | | | | reset: add t7112 for submodule updatesJens Lehmann2014-07-141-0/+14