Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'js/rebase-reschedule-applies-only-to-interactive' | Junio C Hamano | 2019-07-12 | 1 | -0/+8 |
|\ | |||||
| * | rebase --am: ignore rebase.rescheduleFailedExec | Johannes Schindelin | 2019-07-01 | 1 | -0/+8 |
* | | Merge branch 'jt/t5551-test-chunked' | Junio C Hamano | 2019-07-12 | 1 | -3/+2 |
|\ \ | |||||
| * | | t5551: test usage of chunked encoding explicitly | Jonathan Tan | 2019-06-27 | 1 | -3/+2 |
* | | | Merge branch 'ds/fetch-disable-force-notice' | Junio C Hamano | 2019-07-10 | 1 | -0/+23 |
|\ \ \ | |||||
| * | | | fetch: add --[no-]show-forced-updates argument | Derrick Stolee | 2019-06-21 | 1 | -0/+23 |
* | | | | Merge branch 'jh/status-aheadbehind' | Junio C Hamano | 2019-07-10 | 2 | -0/+39 |
|\ \ \ \ | |||||
| * | | | | status: ignore status.aheadbehind in porcelain formats | Jeff Hostetler | 2019-06-21 | 1 | -4/+8 |
| * | | | | status: add status.aheadbehind setting | Jeff Hostetler | 2019-06-21 | 2 | -0/+35 |
| |/ / / | |||||
* | | | | Merge branch 'sg/t5551-fetch-smart-error-is-translated' | Junio C Hamano | 2019-07-10 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | t5551: use 'test_i18ngrep' to check translated output | SZEDER Gábor | 2019-06-25 | 1 | -2/+2 |
* | | | | | Merge branch 'ms/submodule-foreach-fix' | Junio C Hamano | 2019-07-10 | 1 | -0/+7 |
|\ \ \ \ \ | |||||
| * | | | | | submodule foreach: fix recursion of options | Morian Sonnet | 2019-06-25 | 1 | -0/+7 |
* | | | | | | Merge branch 'jh/msvc' | Junio C Hamano | 2019-07-10 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t0001 (mingw): do not expect a specific order of stdout/stderr | Johannes Schindelin | 2019-06-20 | 1 | -2/+2 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'sg/rebase-progress' | Junio C Hamano | 2019-07-10 | 3 | -75/+55 |
|\ \ \ \ \ \ | |||||
| * | | | | | | progress: use term_clear_line() | SZEDER Gábor | 2019-06-27 | 1 | -3/+3 |
| * | | | | | | rebase: fix garbled progress display with '-x' | SZEDER Gábor | 2019-06-27 | 1 | -2/+2 |
| * | | | | | | t3404: make the 'rebase.missingCommitsCheck=ignore' test more focused | SZEDER Gábor | 2019-06-24 | 1 | -14/+1 |
| * | | | | | | t3404: modernize here doc style | SZEDER Gábor | 2019-06-24 | 1 | -65/+58 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'js/t0001-case-insensitive' | Junio C Hamano | 2019-07-10 | 2 | -14/+23 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t0001: fix on case-insensitive filesystems | Johannes Schindelin | 2019-06-24 | 2 | -14/+23 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'ab/fail-prereqs-in-test' | Junio C Hamano | 2019-07-10 | 2 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | tests: mark two failing tests under FAIL_PREREQS | Ævar Arnfjörð Bjarmason | 2019-06-21 | 2 | -2/+2 |
* | | | | | | | Merge branch 'nd/switch-and-restore' | Junio C Hamano | 2019-07-10 | 9 | -73/+387 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t2027: use test_must_be_empty | Nguyễn Thái Ngọc Duy | 2019-06-20 | 1 | -3/+2 |
| * | | | | | | | doc: promote "git restore" | Nguyễn Thái Ngọc Duy | 2019-05-07 | 2 | -51/+51 |
| * | | | | | | | t: add tests for restore | Nguyễn Thái Ngọc Duy | 2019-05-07 | 3 | -0/+221 |
| * | | | | | | | doc: promote "git switch" | Nguyễn Thái Ngọc Duy | 2019-04-02 | 1 | -12/+12 |
| * | | | | | | | t: add tests for switch | Nguyễn Thái Ngọc Duy | 2019-04-02 | 1 | -0/+96 |
| * | | | | | | | switch: no worktree status unless real branch switch happens | Nguyễn Thái Ngọc Duy | 2019-04-02 | 1 | -14/+0 |
| * | | | | | | | checkout: advice how to get out of detached HEAD mode | Nguyễn Thái Ngọc Duy | 2019-04-02 | 1 | -0/+12 |
| * | | | | | | | t: rename t2014-switch.sh to t2014-checkout-switch.sh | Nguyễn Thái Ngọc Duy | 2019-04-02 | 1 | -0/+0 |
* | | | | | | | | Merge branch 'jk/oidhash' | Junio C Hamano | 2019-07-10 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | object: convert lookup_unknown_object() to use object_id | Jeff King | 2019-06-20 | 1 | -3/+3 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'nd/fetch-multi-gc-once' | Junio C Hamano | 2019-07-10 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fetch: only run 'gc' once when fetching multiple remotes | Nguyễn Thái Ngọc Duy | 2019-06-20 | 1 | -2/+5 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'es/rev-list-no-object-names' | Junio C Hamano | 2019-07-10 | 1 | -0/+20 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rev-list: teach --no-object-names to enable piping | Emily Shaffer | 2019-06-20 | 1 | -0/+20 |
* | | | | | | | | | Merge branch 'dl/includeif-onbranch' | Junio C Hamano | 2019-07-10 | 1 | -0/+39 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | config: learn the "onbranch:" includeIf condition | Denton Liu | 2019-06-05 | 1 | -0/+39 |
* | | | | | | | | | | Merge branch 'pw/rebase-abort-clean-rewritten' | Junio C Hamano | 2019-07-10 | 1 | -1/+17 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | rebase --abort/--quit: cleanup refs/rewritten | Phillip Wood | 2019-05-15 | 1 | -1/+17 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'am/p4-branches-excludes' | Junio C Hamano | 2019-07-10 | 2 | -5/+178 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | git-p4: respect excluded paths when detecting branches | Mazo, Andrey | 2019-04-02 | 1 | -1/+1 |
| * | | | | | | | | | | git-p4: add failing test for "git-p4: respect excluded paths when detecting b... | Mazo, Andrey | 2019-04-02 | 1 | -0/+40 |
| * | | | | | | | | | | git-p4: don't exclude other files with same prefix | Mazo, Andrey | 2019-04-02 | 1 | -2/+2 |
| * | | | | | | | | | | git-p4: add failing test for "don't exclude other files with same prefix" | Mazo, Andrey | 2019-04-02 | 1 | -5/+46 |
| * | | | | | | | | | | git-p4: match branches case insensitively if configured | Mazo, Andrey | 2019-04-02 | 1 | -2/+2 |
| * | | | | | | | | | | git-p4: add failing test for "git-p4: match branches case insensitively if co... | Mazo, Andrey | 2019-04-02 | 1 | -0/+92 |