summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pt/xdg-config-path' into maintJunio C Hamano2015-06-0510-81/+243
|\
| * path.c: remove home_config_paths()pt/xdg-config-pathPaul Tan2015-05-062-29/+0
| * git-config: replace use of home_config_paths()Paul Tan2015-05-062-8/+4
| * git-commit: replace use of home_config_paths()Paul Tan2015-05-061-5/+3
| * credential-store.c: replace home_config_paths() with xdg_config_home()Paul Tan2015-05-061-1/+1
| * dir.c: replace home_config_paths() with xdg_config_home()Paul Tan2015-05-061-5/+2
| * attr.c: replace home_config_paths() with xdg_config_home()Paul Tan2015-05-061-5/+2
| * path.c: implement xdg_config_home()Paul Tan2015-05-062-0/+22
| * t0302: "unreadable" test needs POSIXPERMpt/credential-xdgJunio C Hamano2015-03-251-1/+1
| * t0302: test credential-store support for XDG_CONFIG_HOMEPaul Tan2015-03-241-0/+114
| * git-credential-store: support XDG_CONFIG_HOMEPaul Tan2015-03-242-6/+42
| * git-credential-store: support multiple credential filesPaul Tan2015-03-241-25/+56
* | Git 2.4.2v2.4.2Junio C Hamano2015-05-264-3/+49
* | Merge branch 'jk/still-interesting' into maintJunio C Hamano2015-05-261-4/+19
|\ \
| * | limit_list: avoid quadratic behavior from still_interestingJeff King2015-04-171-4/+19
* | | Merge branch 'jc/hash-object' into maintJunio C Hamano2015-05-265-9/+43
|\ \ \
| * | | write_sha1_file(): do not use a separate sha1[] arrayjc/hash-objectJunio C Hamano2015-05-051-4/+1
| * | | t1007: add hash-object --literally testsEric Sunshine2015-05-051-0/+11
| * | | hash-object --literally: fix buffer overrun with extra-long object typeEric Sunshine2015-05-053-3/+23
| * | | git-hash-object.txt: document --literally optionEric Sunshine2015-05-041-2/+8
* | | | Merge branch 'jk/rebase-quiet-noop' into maintJunio C Hamano2015-05-261-1/+1
|\ \ \ \
| * | | | rebase: silence "git checkout" for noop rebasejk/rebase-quiet-noopJeff King2015-04-281-1/+1
| | |/ / | |/| |
* | | | Merge branch 'sg/complete-decorate-full-not-long' into maintJunio C Hamano2015-05-261-1/+1
|\ \ \ \
| * | | | completion: fix and update 'git log --decorate=' optionssg/complete-decorate-full-not-longSZEDER Gábor2015-05-031-1/+1
* | | | | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maintJunio C Hamano2015-05-262-1/+19
|\ \ \ \ \
| * | | | | filter-branch: avoid passing commit message through sedJeff King2015-04-292-1/+19
| | |/ / / | |/| | |
* | | | | Merge branch 'jc/daemon-no-ipv6-for-2.4.1' into maintJunio C Hamano2015-05-261-1/+1
|\ \ \ \ \
| * | | | | daemon: unbreak NO_IPV6 build regressionjc/daemon-no-ipv6-for-2.4.1Junio C Hamano2015-05-051-1/+1
* | | | | | Merge branch 'jk/stash-require-clean-index' into maintJunio C Hamano2015-05-262-7/+16
|\ \ \ \ \ \
| * | | | | | stash: require a clean index to applyJeff King2015-04-222-0/+9
| * | | | | | t3903: avoid applying onto dirty indexJeff King2015-04-221-2/+2
| * | | | | | t3903: stop hard-coding commit sha1sJeff King2015-04-221-5/+5
* | | | | | | Merge branch 'jk/git-no-more-argv0-path-munging' into maintJunio C Hamano2015-05-261-1/+0
|\ \ \ \ \ \ \
| * | | | | | | stop putting argv[0] dirname at front of PATHjk/git-no-more-argv0-path-mungingJeff King2015-04-221-1/+0
| |/ / / / / /
* | | | | | | Git 2.4.1v2.4.1Junio C Hamano2015-05-134-3/+44
* | | | | | | Merge branch 'sb/line-log-plug-pairdiff-leak' into maintJunio C Hamano2015-05-131-0/+1
|\ \ \ \ \ \ \
| * | | | | | | line-log.c: fix a memleaksb/line-log-plug-pairdiff-leakStefan Beller2015-03-301-0/+1
* | | | | | | | Merge branch 'sb/test-bitmap-free-at-end' into maintJunio C Hamano2015-05-131-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | pack-bitmap.c: fix a memleakStefan Beller2015-04-121-0/+2
* | | | | | | | | Merge branch 'nd/t1509-chroot-test' into maintJunio C Hamano2015-05-131-9/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t1509: update prepare script to be able to run t1509 in chroot againnd/t1509-chroot-testNguyễn Thái Ngọc Duy2015-04-181-9/+29
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/type-from-string-gently' into maintJunio C Hamano2015-05-132-1/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | type_from_string_gently: make sure length matchesjk/type-from-string-gentlyJeff King2015-04-172-1/+10
* | | | | | | | | | Merge branch 'ep/fix-test-lib-functions-report' into maintJunio C Hamano2015-05-131-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | test-lib-functions.sh: fix the second argument to some helper functionsep/fix-test-lib-functions-reportElia Pinto2015-04-161-2/+2
* | | | | | | | | | | Merge branch 'cn/bom-in-gitignore' into maintJunio C Hamano2015-05-136-5/+39
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | attr: skip UTF8 BOM at the beginning of the input filecn/bom-in-gitignoreJunio C Hamano2015-04-161-2/+7
| * | | | | | | | | | | config: use utf8_bom[] from utf.[ch] in git_parse_source()Junio C Hamano2015-04-161-3/+3
| * | | | | | | | | | | utf8-bom: introduce skip_utf8_bom() helperJunio C Hamano2015-04-163-5/+18
| * | | | | | | | | | | add_excludes_from_file: clarify the bom skipping logicJunio C Hamano2015-04-161-4/+5
View Lorry Controller Status