summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t4102: test renaming and rewriting the same filejc/apply-atomicJunio C Hamano2014-10-231-0/+29
* t4102: modernise styleJunio C Hamano2014-10-231-47/+51
* WIPJunio C Hamano2014-10-232-19/+38
* WIP: fix BMC in the diffJunio C Hamano2014-10-233-3/+11
* 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
| * | | | t7610-mergetool: use test_config to isolate testsDavid Aguilar2014-10-161-5/+3
| |/ / /
| * | | t7610-mergetool: add missing && and remove commented-out codeDavid Aguilar2014-10-151-8/+2
| * | | t7610-mergetool: use tabs instead of a mix of tabs and spacesDavid Aguilar2014-10-151-459/+459
* | | | Merge branch 'rs/ref-transaction'Junio C Hamano2014-10-2145-350/+849
|\ \ \ \
| * | | | ref_transaction_commit: bail out on failure to remove a refrs/ref-transactionJonathan Nieder2014-10-151-2/+6
| * | | | lockfile: remove unable_to_lock_errorJonathan Nieder2014-10-152-11/+0
| * | | | refs.c: do not permit err == NULLJonathan Nieder2014-10-151-19/+27
| * | | | remote rm/prune: print a message when writing packed-refs failsRonnie Sahlberg2014-10-151-4/+11
| * | | | for-each-ref: skip and warn about broken ref namesRonnie Sahlberg2014-10-151-0/+5
| * | | | refs.c: allow listing and deleting badly named refsRonnie Sahlberg2014-10-155-38/+273
| * | | | test: put tests for handling of bad ref names in one placeRonnie Sahlberg2014-10-153-74/+84
| * | | | packed-ref cache: forbid dot-components in refnamesJonathan Nieder2014-10-152-16/+4
| * | | | branch -d: simplify by using RESOLVE_REF_READINGRonnie Sahlberg2014-10-151-3/+4
| * | | | branch -d: avoid repeated symref resolutionJonathan Nieder2014-10-156-3/+68
| * | | | reflog test: test interaction with detached HEADJunio C Hamano2014-10-151-0/+70
| * | | | refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg2014-10-1528-92/+124
| * | | | refs.c: make write_ref_sha1 staticRonnie Sahlberg2014-10-152-5/+8
| * | | | fetch.c: change s_update_ref to use a ref transactionRonnie Sahlberg2014-10-151-10/+24
| * | | | refs.c: ref_transaction_commit: distinguish name conflicts from other errorsRonnie Sahlberg2014-10-152-12/+23
| * | | | refs.c: pass a list of names to skip to is_refname_availableRonnie Sahlberg2014-10-151-18/+32
| * | | | refs.c: call lock_ref_sha1_basic directly from commitRonnie Sahlberg2014-10-151-6/+6
| * | | | refs.c: refuse to lock badly named refs in lock_ref_sha1_basicRonnie Sahlberg2014-10-151-2/+5
| * | | | rename_ref: don't ask read_ref_full where the ref came fromRonnie Sahlberg2014-10-151-1/+1
| * | | | refs.c: pass the ref log message to _create/delete/update instead of _commitRonnie Sahlberg2014-10-1511-44/+54
| * | | | refs.c: add an err argument to delete_ref_looseRonnie Sahlberg2014-10-151-4/+5
| * | | | wrapper.c: add a new function unlink_or_msgRonnie Sahlberg2014-10-152-0/+23
| * | | | refs.c: lock_ref_sha1_basic is used for all refsRonnie Sahlberg2014-10-151-1/+1
View Lorry Controller Status