summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/test-helpers'Junio C Hamano2016-04-2939-52/+52
|\
| * test helpers: move test-* to t/helper/ subdirectoryNguyễn Thái Ngọc Duy2016-04-1539-50/+50
| * Makefile: clean *.o files we createJunio C Hamano2016-04-151-2/+2
* | Merge branch 'da/user-useconfigonly'Junio C Hamano2016-04-291-6/+10
|\ \
| * | ident: give "please tell me" message upon useConfigOnly errorda/user-useconfigonlyMarios Titas2016-04-011-4/+8
| * | ident: check for useConfigOnly before auto-detection of name/emailMarios Titas2016-04-011-6/+6
* | | Sync with maintJunio C Hamano2016-04-251-5/+5
|\ \ \
| * \ \ Merge tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po into maintJunio C Hamano2016-04-251-5/+5
| |\ \ \
| | * \ \ Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git into maintJiang Xin2016-04-241-5/+5
| | |\ \ \
| | | * \ \ Merge pull request #9 from vascool/frJean-Noël Avila2016-03-251-5/+5
| | | |\ \ \
| | | | * | | l10n: fr: don't translate "merge" as a parameterVasco Almeida2016-03-251-1/+1
| | | | * | | l10n: fr: change "id de clé" to match "id-clé"Vasco Almeida2016-03-251-1/+1
| | | | * | | l10n: fr: fix wrongly translated option nameVasco Almeida2016-03-251-2/+2
| | | | * | | l10n: fr: fix transcation of "dir"Vasco Almeida2016-03-251-1/+1
| | | |/ / /
* | | | | | Seventh batch for post 2.8 cycleJunio C Hamano2016-04-251-0/+22
* | | | | | Merge branch 'sb/submodule-path-misc-bugs'Junio C Hamano2016-04-253-11/+133
|\ \ \ \ \ \
| * | | | | | t7407: make expectation as clear as possiblesb/submodule-path-misc-bugsStefan Beller2016-03-301-2/+6
| * | | | | | submodule update: test recursive path reporting from subdirectoryStefan Beller2016-03-301-0/+20
| * | | | | | submodule update: align reporting path for custom command executionStefan Beller2016-03-302-5/+28
| * | | | | | submodule status: correct path handling in recursive submodulesStefan Beller2016-03-302-0/+22
| * | | | | | submodule update --init: correct path handling in recursive submodulesStefan Beller2016-03-302-1/+34
| * | | | | | submodule foreach: correct path display in recursive submodulesStefan Beller2016-03-302-3/+23
* | | | | | | Merge branch 'en/merge-trivial-fix'Junio C Hamano2016-04-252-1/+13
|\ \ \ \ \ \ \
| * | | | | | | builtin/merge.c: fix a bug with trivial mergesen/merge-trivial-fixElijah Newren2016-04-122-1/+9
| * | | | | | | t7605: add a testcase demonstrating a bug with trivial mergesElijah Newren2016-04-121-1/+5
* | | | | | | | Merge branch 'en/merge-octopus-fix'Junio C Hamano2016-04-252-0/+159
|\ \ \ \ \ \ \ \
| * | | | | | | | merge-octopus: abort if index does not match HEADen/merge-octopus-fixElijah Newren2016-04-122-3/+9
| * | | | | | | | t6044: new merge testcases for when index doesn't match HEADElijah Newren2016-04-121-0/+153
| |/ / / / / / /
* | | | | | | | Merge branch 'dt/pre-refs-backend'Junio C Hamano2016-04-2510-288/+440
|\ \ \ \ \ \ \ \
| * | | | | | | | refs: on symref reflog expire, lock symref not referrentdt/pre-refs-backendDavid Turner2016-04-102-1/+12
| * | | | | | | | refs: move resolve_ref_unsafe into common codeDavid Turner2016-04-103-79/+83
| * | | | | | | | show_head_ref(): check the result of resolve_ref_namespace()Michael Haggerty2016-04-101-2/+2
| * | | | | | | | check_aliased_update(): check that dst_name is non-NULLMichael Haggerty2016-04-101-1/+1
| * | | | | | | | checkout_paths(): remove unneeded flag variableMichael Haggerty2016-04-101-2/+1
| * | | | | | | | cmd_merge(): remove unneeded flag variableMichael Haggerty2016-04-101-2/+2
| * | | | | | | | fsck_head_link(): remove unneeded flag variableMichael Haggerty2016-04-101-2/+1
| * | | | | | | | read_raw_ref(): change flags parameter to unsigned intMichael Haggerty2016-04-101-3/+3
| * | | | | | | | files-backend: inline resolve_ref_1() into resolve_ref_unsafe()Michael Haggerty2016-04-101-22/+9
| * | | | | | | | read_raw_ref(): manage own scratch spaceMichael Haggerty2016-04-101-35/+41
| * | | | | | | | files-backend: break out ref readingDavid Turner2016-04-101-99/+145
| * | | | | | | | resolve_ref_1(): eliminate local variable "bad_name"Michael Haggerty2016-04-101-8/+5
| * | | | | | | | resolve_ref_1(): reorder codeMichael Haggerty2016-04-101-2/+2
| * | | | | | | | resolve_ref_1(): eliminate local variableMichael Haggerty2016-04-101-7/+6
| * | | | | | | | resolve_ref_unsafe(): ensure flags is always setMichael Haggerty2016-04-101-18/+13
| * | | | | | | | resolve_ref_unsafe(): use for loop to count up to MAXDEPTHMichael Haggerty2016-04-101-7/+6
| * | | | | | | | resolve_missing_loose_ref(): simplify semanticsMichael Haggerty2016-04-101-14/+10
| * | | | | | | | t1430: improve test coverage of deletion of badly-named refsMichael Haggerty2016-04-101-8/+96
| * | | | | | | | t1430: test for-each-ref in the presence of badly-named refsMichael Haggerty2016-04-101-0/+16
| * | | | | | | | t1430: don't rely on symbolic-ref for creating broken symrefsMichael Haggerty2016-04-101-2/+2
| * | | | | | | | t1430: clean up broken refs/tags/shadowMichael Haggerty2016-04-101-1/+1