Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ag/userdiff-go-funcname' | Junio C Hamano | 2018-03-08 | 6 | -0/+26 |
|\ | |||||
| * | userdiff: add built-in pattern for golangag/userdiff-go-funcname | Alban Gruin | 2018-03-01 | 6 | -0/+26 |
* | | Merge branch 'bp/untracked-cache-noflush' | Junio C Hamano | 2018-03-08 | 1 | -0/+3 |
|\ \ | |||||
| * | | untracked cache: use git_env_bool() not getenv() for customizationbp/untracked-cache-noflush | Junio C Hamano | 2018-02-28 | 1 | -2/+2 |
| * | | dir.c: don't flag the index as dirty for changes to the untracked cache | Ben Peart | 2018-02-05 | 1 | -0/+3 |
* | | | Merge branch 'rs/perf-repeat-thrice-by-default' | Junio C Hamano | 2018-03-08 | 1 | -5/+3 |
|\ \ \ | |||||
| * | | | perf: use GIT_PERF_REPEAT_COUNT=3 by default even without config filers/perf-repeat-thrice-by-default | René Scharfe | 2018-02-27 | 1 | -5/+3 |
* | | | | Merge branch 'jc/test-must-be-empty' | Junio C Hamano | 2018-03-08 | 1 | -1/+5 |
|\ \ \ \ | |||||
| * | | | | test_must_be_empty: make sure the file exists, not just empty | Junio C Hamano | 2018-02-27 | 1 | -1/+5 |
| * | | | | Merge branch 'sb/submodule-update-reset-fix' into maint | Junio C Hamano | 2018-02-27 | 1 | -2/+17 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'ab/commit-m-with-fixup' into maint | Junio C Hamano | 2018-02-27 | 1 | -1/+8 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'nd/ita-wt-renames-in-status' into maint | Junio C Hamano | 2018-02-27 | 1 | -0/+72 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'jh/status-no-ahead-behind' | Junio C Hamano | 2018-03-08 | 2 | -0/+104 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | status: support --no-ahead-behind in long formatjh/status-no-ahead-behind | Jeff Hostetler | 2018-01-24 | 1 | -0/+29 |
| * | | | | | | | | status: update short status to respect --no-ahead-behind | Jeff Hostetler | 2018-01-24 | 1 | -0/+13 |
| * | | | | | | | | status: add --[no-]ahead-behind to status and commit for V2 format. | Jeff Hostetler | 2018-01-24 | 1 | -0/+62 |
* | | | | | | | | | Merge branch 'jk/test-helper-v-output-fix' | Junio C Hamano | 2018-03-06 | 1 | -10/+10 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t: send verbose test-helper output to fd 4jk/test-helper-v-output-fix | Jeff King | 2018-02-22 | 1 | -10/+10 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jk/cached-commit-buffer' | Junio C Hamano | 2018-03-06 | 1 | -31/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | revision: drop --show-all optionjk/cached-commit-buffer | Jeff King | 2018-02-22 | 1 | -31/+0 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jc/allow-ff-merging-kept-tags' | Junio C Hamano | 2018-03-06 | 2 | -2/+38 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | merge: allow fast-forward when merging a tracked tagjc/allow-ff-merging-kept-tags | Junio C Hamano | 2018-02-16 | 2 | -2/+38 |
* | | | | | | | | | | Merge branch 'sg/t6300-modernize' | Junio C Hamano | 2018-03-06 | 1 | -5/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t6300-for-each-ref: fix "more than one quoting style" testssg/t6300-modernize | SZEDER Gábor | 2018-02-13 | 1 | -5/+2 |
* | | | | | | | | | | | Merge branch 'nd/rebase-show-current-patch' | Junio C Hamano | 2018-03-06 | 3 | -0/+47 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | rebase: introduce and use pseudo-ref REBASE_HEADnd/rebase-show-current-patch | Nguyễn Thái Ngọc Duy | 2018-02-12 | 2 | -2/+6 |
| * | | | | | | | | | | | rebase: add --show-current-patch | Nguyễn Thái Ngọc Duy | 2018-02-12 | 2 | -0/+38 |
| * | | | | | | | | | | | am: add --show-current-patch | Nguyễn Thái Ngọc Duy | 2018-02-12 | 1 | -0/+5 |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'ab/fetch-prune' | Junio C Hamano | 2018-03-06 | 1 | -44/+194 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | fetch: make the --prune-tags work with <url>ab/fetch-prune | Ævar Arnfjörð Bjarmason | 2018-02-09 | 1 | -9/+7 |
| * | | | | | | | | | | | fetch: add a --prune-tags option and fetch.pruneTags config | Ævar Arnfjörð Bjarmason | 2018-02-09 | 1 | -0/+70 |
| * | | | | | | | | | | | fetch tests: add scaffolding for the new fetch.pruneTags | Ævar Arnfjörð Bjarmason | 2018-02-09 | 1 | -42/+50 |
| * | | | | | | | | | | | fetch tests: fetch <url> <spec> as well as fetch [<remote>] | Ævar Arnfjörð Bjarmason | 2018-02-09 | 1 | -4/+40 |
| * | | | | | | | | | | | fetch tests: expand case/esac for later change | Ævar Arnfjörð Bjarmason | 2018-02-09 | 1 | -2/+6 |
| * | | | | | | | | | | | fetch tests: double quote a variable for interpolation | Ævar Arnfjörð Bjarmason | 2018-02-09 | 1 | -1/+1 |
| * | | | | | | | | | | | fetch tests: test --prune and refspec interaction | Ævar Arnfjörð Bjarmason | 2018-02-09 | 1 | -0/+12 |
| * | | | | | | | | | | | fetch tests: add a tag to be deleted to the pruning tests | Ævar Arnfjörð Bjarmason | 2018-02-09 | 1 | -40/+53 |
| * | | | | | | | | | | | fetch tests: re-arrange arguments for future readability | Ævar Arnfjörð Bjarmason | 2018-02-09 | 1 | -38/+44 |
| * | | | | | | | | | | | fetch tests: refactor in preparation for testing tag pruning | Ævar Arnfjörð Bjarmason | 2018-02-09 | 1 | -3/+6 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'sm/mv-dry-run-update' | Junio C Hamano | 2018-03-06 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t7001: add test case for --dry-run | Stefan Moch | 2018-02-07 | 1 | -0/+6 |
* | | | | | | | | | | | | Merge branch 'nm/tag-edit' | Junio C Hamano | 2018-03-06 | 1 | -0/+30 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | tag: add --edit optionnm/tag-edit | Nicolas Morey-Chaisemartin | 2018-02-07 | 1 | -0/+30 |
* | | | | | | | | | | | | Merge branch 'jk/push-options-via-transport-fix' | Junio C Hamano | 2018-02-28 | 1 | -11/+29 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | remote-curl: unquote incoming push-optionsjk/push-options-via-transport-fix | Jeff King | 2018-02-20 | 1 | -0/+18 |
| * | | | | | | | | | | | | t5545: factor out http repository setup | Jeff King | 2018-02-20 | 1 | -11/+11 |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'nd/add-i-ignore-submodules' into maint | Junio C Hamano | 2018-02-15 | 1 | -0/+48 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tg/stash-with-pathspec-fix' into maint | Junio C Hamano | 2018-02-15 | 1 | -0/+32 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/abort-clone-with-existing-dest' into maint | Junio C Hamano | 2018-02-15 | 1 | -26/+74 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/merge-symlink-ours-theirs' into maint | Junio C Hamano | 2018-02-15 | 1 | -0/+32 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |