summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2014-10-16mergetool: use more conservative temporary filenamesLibravatar David Aguilar1-5/+11
2014-10-16test-lib-functions: adjust style to match CodingGuidelinesLibravatar David Aguilar1-12/+18
2014-10-16t7610-mergetool: use test_config to isolate testsLibravatar David Aguilar1-5/+3
2014-10-16mergetools/meld: make usage of `--output` configurable and more robustLibravatar David Aguilar2-2/+16
2014-10-15contacts: add a Makefile to generate docs and installLibravatar Sebastian Schuberth2-0/+74
2014-10-15subtree: add an install-html targetLibravatar Sebastian Schuberth2-3/+9
2014-10-15difftool: don't assume that default sh is saneLibravatar Charles Bailey2-5/+5
2014-10-15mergetool: don't require a work tree for --tool-helpLibravatar Charles Bailey1-1/+4
2014-10-15git-sh-setup: move GIT_DIR initialization into a functionLibravatar David Aguilar1-2/+6
2014-10-15mergetool: use more conservative temporary filenamesLibravatar David Aguilar1-5/+11
2014-10-15test-lib-functions: adjust style to match CodingGuidelinesLibravatar David Aguilar1-12/+18
2014-10-15t7610-mergetool: prefer test_config over git configLibravatar David Aguilar1-11/+9
2014-10-15t7610-mergetool: add missing && and remove commented-out codeLibravatar David Aguilar1-8/+2
2014-10-15t7610-mergetool: use tabs instead of a mix of tabs and spacesLibravatar David Aguilar1-459/+459
2014-10-15ref_transaction_commit: bail out on failure to remove a refLibravatar Jonathan Nieder1-2/+6
2014-10-15lockfile: remove unable_to_lock_errorLibravatar Jonathan Nieder2-11/+0
2014-10-15refs.c: do not permit err == NULLLibravatar Jonathan Nieder1-19/+27
2014-10-15remote rm/prune: print a message when writing packed-refs failsLibravatar Ronnie Sahlberg1-4/+11
2014-10-15for-each-ref: skip and warn about broken ref namesLibravatar Ronnie Sahlberg1-0/+5
2014-10-15refs.c: allow listing and deleting badly named refsLibravatar Ronnie Sahlberg5-38/+273
2014-10-15test: put tests for handling of bad ref names in one placeLibravatar Ronnie Sahlberg3-74/+84
2014-10-15packed-ref cache: forbid dot-components in refnamesLibravatar Jonathan Nieder2-16/+4
2014-10-15branch -d: simplify by using RESOLVE_REF_READINGLibravatar Ronnie Sahlberg1-3/+4
2014-10-15branch -d: avoid repeated symref resolutionLibravatar Jonathan Nieder6-3/+68
2014-10-15reflog test: test interaction with detached HEADLibravatar Junio C Hamano1-0/+70
2014-10-15refs.c: change resolve_ref_unsafe reading argument to be a flags fieldLibravatar Ronnie Sahlberg28-92/+124
2014-10-15refs.c: make write_ref_sha1 staticLibravatar Ronnie Sahlberg2-5/+8
2014-10-15fetch.c: change s_update_ref to use a ref transactionLibravatar Ronnie Sahlberg1-10/+24
2014-10-15refs.c: ref_transaction_commit: distinguish name conflicts from other errorsLibravatar Ronnie Sahlberg2-12/+23
2014-10-15refs.c: pass a list of names to skip to is_refname_availableLibravatar Ronnie Sahlberg1-18/+32
2014-10-15refs.c: call lock_ref_sha1_basic directly from commitLibravatar Ronnie Sahlberg1-6/+6
2014-10-15refs.c: refuse to lock badly named refs in lock_ref_sha1_basicLibravatar Ronnie Sahlberg1-2/+5
2014-10-15rename_ref: don't ask read_ref_full where the ref came fromLibravatar Ronnie Sahlberg1-1/+1
2014-10-15refs.c: pass the ref log message to _create/delete/update instead of _commitLibravatar Ronnie Sahlberg11-44/+54
2014-10-15refs.c: add an err argument to delete_ref_looseLibravatar Ronnie Sahlberg1-4/+5
2014-10-15wrapper.c: add a new function unlink_or_msgLibravatar Ronnie Sahlberg2-0/+23
2014-10-15refs.c: lock_ref_sha1_basic is used for all refsLibravatar Ronnie Sahlberg1-1/+1
2014-10-15wrapper.c: remove/unlink_or_warn: simplify, treat ENOENT as successLibravatar Ronnie Sahlberg3-11/+12
2014-10-15mv test: recreate mod/ directory instead of relying on stale copyLibravatar Jonathan Nieder1-5/+10
2014-10-14completion: silence "fatal: Not a git repository" errorLibravatar John Szakmeister1-1/+2
2014-10-14color_parse: do not mention variable name in error messageLibravatar Jeff King11-28/+26
2014-10-14pass config slots as pointers instead of offsetsLibravatar Jonathan Nieder5-22/+21
2014-10-14Update draft release notes to 2.2Libravatar Junio C Hamano1-0/+21
2014-10-14Merge branch 'bc/asciidoc-pretty-formats-fix'Libravatar Junio C Hamano1-1/+1
2014-10-14Merge branch 'rs/plug-leak-in-bundle'Libravatar Junio C Hamano1-7/+10
2014-10-14Merge branch 'rs/more-uses-of-skip-prefix'Libravatar Junio C Hamano10-75/+69
2014-10-14Merge branch 'rs/mailsplit'Libravatar Junio C Hamano1-1/+0
2014-10-14Merge branch 'rs/sha1-array-test'Libravatar Junio C Hamano5-2/+130
2014-10-14Merge branch 'mh/lockfile-stdio'Libravatar Junio C Hamano5-39/+71
2014-10-14Merge branch 'mh/lockfile'Libravatar Junio C Hamano36-260/+510