summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pt/xdg-config-path'Junio C Hamano2015-05-118-53/+34
|\
| * 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
* | Merge branch 'ep/do-not-feed-a-pointer-to-array-size'Junio C Hamano2015-05-111-1/+53
|\ \
| * | git-compat-util.h: implement a different ARRAY_SIZE macro for for safely deri...ep/do-not-feed-a-pointer-to-array-sizeElia Pinto2015-05-051-1/+53
* | | Merge branch 'jc/hash-object'Junio C Hamano2015-05-115-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 'sb/prefix-path-free-results'Junio C Hamano2015-05-112-13/+10
|\ \ \ \
| * | | | prefix_path(): unconditionally free results in the callerssb/prefix-path-free-resultsStefan Beller2015-05-052-13/+10
* | | | | Merge branch 'sg/completion-no-redundant-all-command-list'Junio C Hamano2015-05-111-1/+0
|\ \ \ \ \
| * | | | | completion: remove redundant __git_compute_all_commands() callsg/completion-no-redundant-all-command-listSZEDER Gábor2015-05-031-1/+0
| |/ / / /
* | | | | Merge branch 'sg/complete-decorate-full-not-long'Junio C Hamano2015-05-111-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'Junio C Hamano2015-05-112-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'Junio C Hamano2015-05-111-1/+1
|\ \ \ \ \ \ \
| * | | | | | | daemon: unbreak NO_IPV6 build regressionjc/daemon-no-ipv6-for-2.4.1Junio C Hamano2015-05-051-1/+1
* | | | | | | | Merge branch 'jn/clean-use-error-not-fprintf-on-stderr'Junio C Hamano2015-05-111-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | config: use error() instead of fprintf(stderr, ...)jn/clean-use-error-not-fprintf-on-stderrJonathan Nieder2015-05-041-2/+2
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'tb/blame-resurrect-convert-to-git'Junio C Hamano2015-05-112-3/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | blame: CRLF in the working tree and LF in the repotb/blame-resurrect-convert-to-gitTorsten Bögershausen2015-05-032-3/+16
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'va/fix-git-p4-tests'Junio C Hamano2015-05-111-8/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | git-p4: t9814: prevent --chain-lint failureva/fix-git-p4-testsLuke Diamand2015-04-281-8/+3
* | | | | | | | | Merge branch 'ld/p4-case-fold'Junio C Hamano2015-05-112-1/+55
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-p4: add failing tests for case-folding p4dld/p4-case-foldLuke Diamand2015-04-282-1/+55
* | | | | | | | | | Merge branch 'jk/rebase-quiet-noop'Junio C Hamano2015-05-111-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rebase: silence "git checkout" for noop rebasejk/rebase-quiet-noopJeff King2015-04-281-1/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'va/p4-client-path'Junio C Hamano2015-05-112-4/+115
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-p4: improve client path detection when branches are usedva/p4-client-pathVitor Antunes2015-04-232-5/+10
| * | | | | | | | | | t9801: check git-p4's branch detection with client spec enabledVitor Antunes2015-04-221-0/+106
* | | | | | | | | | | Merge branch 'mm/add-p-split-error'Junio C Hamano2015-05-112-11/+59
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | stash -p: demonstrate failure of split with mixed y/nmm/add-p-split-errorMatthieu Moy2015-04-161-0/+23
| * | | | | | | | | | | t3904-stash-patch: factor PERL prereq at the top of the fileMatthieu Moy2015-04-161-6/+12
| * | | | | | | | | | | t3904-stash-patch: fix test descriptionMatthieu Moy2015-04-161-1/+1
| * | | | | | | | | | | add -p: demonstrate failure when running 'edit' after a splitMatthieu Moy2015-04-161-0/+22
| * | | | | | | | | | | t3701-add-interactive: simplify codeMatthieu Moy2015-04-161-4/+1
* | | | | | | | | | | | Merge branch 'tb/t0027-crlf'Junio C Hamano2015-05-111-109/+134
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t0027: Add repoMIX and LF_nulTorsten Bögershausen2015-04-251-72/+85
| * | | | | | | | | | | | t0027: support NATIVE_CRLF platformsTorsten Bögershausen2015-04-181-10/+22
| * | | | | | | | | | | | t0027: cleanup: rename functions; avoid non-leading TABsTorsten Bögershausen2015-04-181-92/+92
* | | | | | | | | | | | | Merge branch 'ls/p4-changes-block-size'Junio C Hamano2015-05-113-14/+119
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-p4: use -m when running p4 changesls/p4-changes-block-sizeLex Spoon2015-04-203-14/+119
| |/ / / / / / / / / / / /
View Lorry Controller Status