summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* refs.c: add an err argument to pack_refsrs/ref-transaction-renameRonnie Sahlberg2014-11-073-6/+12
* refs.c: make lock_packed_refs take an err argumentRonnie Sahlberg2014-11-071-12/+13
* refs.c: make add_packed_ref return an error instead of calling dieRonnie Sahlberg2014-11-071-4/+17
* refs.c: replace the onerr argument in update_ref with a strbuf errRonnie Sahlberg2014-11-0712-59/+78
* refs.c: make the *_packed_refs functions staticRonnie Sahlberg2014-11-072-34/+4
* refs.c: make repack_without_refs staticRonnie Sahlberg2014-11-072-4/+1
* remote.c: use a transaction for deleting refsRonnie Sahlberg2014-11-071-40/+40
* refs.c: write updates to packed refs when a transaction has more than one refRonnie Sahlberg2014-11-073-35/+72
* refs.c: move reflog updates into its own functionRonnie Sahlberg2014-11-071-25/+35
* refs.c: rollback the lockfile before we die() in repack_without_refsRonnie Sahlberg2014-11-071-1/+3
* refs.c: update rename_ref to use a transactionRonnie Sahlberg2014-11-072-132/+43
* refs.c: add transaction support for renaming a reflogRonnie Sahlberg2014-11-072-1/+79
* refs.c: use a stringlist for repack_without_refsRonnie Sahlberg2014-11-033-37/+30
* refs.c: use packed refs when deleting refs during a transactionRonnie Sahlberg2014-11-032-37/+138
* refs.c: return error instead of dying when locking fails during transactionRonnie Sahlberg2014-11-031-2/+8
* refs.c: allow passing raw git_committer_info as email to _update_reflogRonnie Sahlberg2014-11-033-17/+48
* refs.c: allow deleting refs with a broken sha1rs/ref-transaction-reflogRonnie Sahlberg2014-11-035-4/+28
* refs.c: remove lock_any_ref_for_updateRonnie Sahlberg2014-11-032-15/+1
* refs.c: make unlock_ref/close_ref/commit_ref staticRonnie Sahlberg2014-11-032-21/+12
* refs.c: rename log_ref_setup to create_reflogRonnie Sahlberg2014-11-033-21/+17
* reflog.c: use a reflog transaction when writing during expireRonnie Sahlberg2014-11-033-51/+40
* refs.c: allow multiple reflog updates during a single transactionRonnie Sahlberg2014-11-031-9/+39
* refs.c: only write reflog update if msg is non-NULLRonnie Sahlberg2014-11-032-2/+4
* refs.c: add a flag to allow reflog updates to truncate the logRonnie Sahlberg2014-10-222-3/+24
* refs.c: add a transaction function to append a reflog entryRonnie Sahlberg2014-10-222-2/+112
* copy.c: make copy_fd preserve meaningful errnoRonnie Sahlberg2014-10-221-5/+10
* refs.c: add a function to append a reflog entry to a fdRonnie Sahlberg2014-10-221-18/+30
* refs.c: add a new update_type field to ref_updateRonnie Sahlberg2014-10-221-4/+23
* refs.c: rename the transaction functionsRonnie Sahlberg2014-10-2212-127/+126
* refs.c: make ref_transaction_delete a wrapper for ref_transaction_updateRonnie Sahlberg2014-10-222-21/+3
* refs.c make ref_transaction_create a wrapper to ref_transaction_updateRonnie Sahlberg2014-10-221-25/+2
* Update draft release notes to 2.2Junio C Hamano2014-10-211-4/+17
* Merge branch 'js/completion-hide-not-a-repo'Junio C Hamano2014-10-211-1/+2
|\
| * completion: silence "fatal: Not a git repository" errorjs/completion-hide-not-a-repoJohn Szakmeister2014-10-141-1/+2
* | Merge branch 'da/mergetool-meld'Junio C Hamano2014-10-212-2/+16
|\ \
| * | mergetools/meld: make usage of `--output` configurable and more robustda/mergetool-meldDavid Aguilar2014-10-162-2/+16
* | | Merge branch 'da/mergetool-temporary-directory'Junio C Hamano2014-10-213-4/+60
|\ \ \
| * | | t7610-mergetool: add test cases for mergetool.writeToTempda/mergetool-temporary-directoryDavid Aguilar2014-10-161-0/+23
| * | | mergetool: add an option for writing to a temporary directoryDavid Aguilar2014-10-162-4/+37
* | | | Merge branch 'da/mergetool-tool-help'Junio C Hamano2014-10-214-14/+21
|\ \ \ \
| * | | | difftool: don't assume that default sh is saneda/mergetool-tool-helpCharles Bailey2014-10-152-5/+5
| * | | | mergetool: don't require a work tree for --tool-helpCharles Bailey2014-10-151-1/+4
| * | | | git-sh-setup: move GIT_DIR initialization into a functionDavid Aguilar2014-10-151-2/+6
| * | | | mergetool: use more conservative temporary filenamesDavid Aguilar2014-10-151-5/+11
| * | | | test-lib-functions: adjust style to match CodingGuidelinesDavid Aguilar2014-10-151-12/+18
| * | | | t7610-mergetool: prefer test_config over git configDavid Aguilar2014-10-151-11/+9
* | | | | Merge branch 'da/mergetool-temporary-filename'Junio C Hamano2014-10-211-5/+11
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | mergetool: use more conservative temporary filenamesda/mergetool-temporary-filenameDavid Aguilar2014-10-161-5/+11
* | | | | Merge branch 'da/mergetool-tests'Junio C Hamano2014-10-212-471/+469
|\ \ \ \ \ | |/ / / /
| * | | | test-lib-functions: adjust style to match CodingGuidelinesda/mergetool-testsDavid Aguilar2014-10-161-12/+18