summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ag/userdiff-go-funcname'Junio C Hamano2018-03-086-0/+26
|\
| * userdiff: add built-in pattern for golangag/userdiff-go-funcnameAlban Gruin2018-03-016-0/+26
* | Merge branch 'bp/untracked-cache-noflush'Junio C Hamano2018-03-081-0/+3
|\ \
| * | untracked cache: use git_env_bool() not getenv() for customizationbp/untracked-cache-noflushJunio C Hamano2018-02-281-2/+2
| * | dir.c: don't flag the index as dirty for changes to the untracked cacheBen Peart2018-02-051-0/+3
* | | Merge branch 'rs/perf-repeat-thrice-by-default'Junio C Hamano2018-03-081-5/+3
|\ \ \
| * | | perf: use GIT_PERF_REPEAT_COUNT=3 by default even without config filers/perf-repeat-thrice-by-defaultRené Scharfe2018-02-271-5/+3
* | | | Merge branch 'jc/test-must-be-empty'Junio C Hamano2018-03-081-1/+5
|\ \ \ \
| * | | | test_must_be_empty: make sure the file exists, not just emptyJunio C Hamano2018-02-271-1/+5
| * | | | Merge branch 'sb/submodule-update-reset-fix' into maintJunio C Hamano2018-02-271-2/+17
| |\ \ \ \
| * \ \ \ \ Merge branch 'ab/commit-m-with-fixup' into maintJunio C Hamano2018-02-271-1/+8
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'nd/ita-wt-renames-in-status' into maintJunio C Hamano2018-02-271-0/+72
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'jh/status-no-ahead-behind'Junio C Hamano2018-03-082-0/+104
|\ \ \ \ \ \ \ \
| * | | | | | | | status: support --no-ahead-behind in long formatjh/status-no-ahead-behindJeff Hostetler2018-01-241-0/+29
| * | | | | | | | status: update short status to respect --no-ahead-behindJeff Hostetler2018-01-241-0/+13
| * | | | | | | | status: add --[no-]ahead-behind to status and commit for V2 format.Jeff Hostetler2018-01-241-0/+62
* | | | | | | | | Merge branch 'jk/test-helper-v-output-fix'Junio C Hamano2018-03-061-10/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t: send verbose test-helper output to fd 4jk/test-helper-v-output-fixJeff King2018-02-221-10/+10
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/cached-commit-buffer'Junio C Hamano2018-03-061-31/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | revision: drop --show-all optionjk/cached-commit-bufferJeff King2018-02-221-31/+0
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/allow-ff-merging-kept-tags'Junio C Hamano2018-03-062-2/+38
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge: allow fast-forward when merging a tracked tagjc/allow-ff-merging-kept-tagsJunio C Hamano2018-02-162-2/+38
* | | | | | | | | | Merge branch 'sg/t6300-modernize'Junio C Hamano2018-03-061-5/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t6300-for-each-ref: fix "more than one quoting style" testssg/t6300-modernizeSZEDER Gábor2018-02-131-5/+2
* | | | | | | | | | | Merge branch 'nd/rebase-show-current-patch'Junio C Hamano2018-03-063-0/+47
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rebase: introduce and use pseudo-ref REBASE_HEADnd/rebase-show-current-patchNguyễn Thái Ngọc Duy2018-02-122-2/+6
| * | | | | | | | | | | rebase: add --show-current-patchNguyễn Thái Ngọc Duy2018-02-122-0/+38
| * | | | | | | | | | | am: add --show-current-patchNguyễn Thái Ngọc Duy2018-02-121-0/+5
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ab/fetch-prune'Junio C Hamano2018-03-061-44/+194
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fetch: make the --prune-tags work with <url>ab/fetch-pruneÆvar Arnfjörð Bjarmason2018-02-091-9/+7
| * | | | | | | | | | | fetch: add a --prune-tags option and fetch.pruneTags configÆvar Arnfjörð Bjarmason2018-02-091-0/+70
| * | | | | | | | | | | fetch tests: add scaffolding for the new fetch.pruneTagsÆvar Arnfjörð Bjarmason2018-02-091-42/+50
| * | | | | | | | | | | fetch tests: fetch <url> <spec> as well as fetch [<remote>]Ævar Arnfjörð Bjarmason2018-02-091-4/+40
| * | | | | | | | | | | fetch tests: expand case/esac for later changeÆvar Arnfjörð Bjarmason2018-02-091-2/+6
| * | | | | | | | | | | fetch tests: double quote a variable for interpolationÆvar Arnfjörð Bjarmason2018-02-091-1/+1
| * | | | | | | | | | | fetch tests: test --prune and refspec interactionÆvar Arnfjörð Bjarmason2018-02-091-0/+12
| * | | | | | | | | | | fetch tests: add a tag to be deleted to the pruning testsÆvar Arnfjörð Bjarmason2018-02-091-40/+53
| * | | | | | | | | | | fetch tests: re-arrange arguments for future readabilityÆvar Arnfjörð Bjarmason2018-02-091-38/+44
| * | | | | | | | | | | fetch tests: refactor in preparation for testing tag pruningÆvar Arnfjörð Bjarmason2018-02-091-3/+6
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'sm/mv-dry-run-update'Junio C Hamano2018-03-061-0/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t7001: add test case for --dry-runStefan Moch2018-02-071-0/+6
* | | | | | | | | | | | Merge branch 'nm/tag-edit'Junio C Hamano2018-03-061-0/+30
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | tag: add --edit optionnm/tag-editNicolas Morey-Chaisemartin2018-02-071-0/+30
* | | | | | | | | | | | Merge branch 'jk/push-options-via-transport-fix'Junio C Hamano2018-02-281-11/+29
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | remote-curl: unquote incoming push-optionsjk/push-options-via-transport-fixJeff King2018-02-201-0/+18
| * | | | | | | | | | | | t5545: factor out http repository setupJeff King2018-02-201-11/+11
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'nd/add-i-ignore-submodules' into maintJunio C Hamano2018-02-151-0/+48
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tg/stash-with-pathspec-fix' into maintJunio C Hamano2018-02-151-0/+32
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/abort-clone-with-existing-dest' into maintJunio C Hamano2018-02-151-26/+74
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/merge-symlink-ours-theirs' into maintJunio C Hamano2018-02-151-0/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \