Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | | | | | Merge branch 'tg/stash-ref-by-index-fix' | Junio C Hamano | 2019-07-10 | 1 | -0/+18 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | stash: fix show referencing stash index | Thomas Gummerer | 2019-06-19 | 1 | -0/+18 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/trailers-use-config' | Junio C Hamano | 2019-07-10 | 1 | -27/+44 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | interpret-trailers: load default config | Jeff King | 2019-06-19 | 1 | -27/+44 |
* | | | | | | | | Merge branch 'js/t3404-typofix' | Junio C Hamano | 2019-07-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t3404: fix a typo | Johannes Schindelin | 2019-06-14 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'pw/add-p-recount' | Junio C Hamano | 2019-07-10 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | add -p: fix checkout -p with pathological context | Phillip Wood | 2019-06-13 | 1 | -0/+8 |
* | | | | | | | | | | Merge branch 'ds/commit-graph-write-refactor' | Junio C Hamano | 2019-07-10 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | commit-graph: return with errors during write | Derrick Stolee | 2019-06-12 | 1 | -0/+8 |
* | | | | | | | | | | | Merge branch 'sg/trace2-rename' | Junio C Hamano | 2019-07-10 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Revert "test-lib: whitelist GIT_TR2_* in the environment" | Ævar Arnfjörð Bjarmason | 2019-06-12 | 1 | -1/+0 |
* | | | | | | | | | | | | Merge branch 'js/mergetool-optim' | Junio C Hamano | 2019-07-10 | 1 | -132/+177 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | t7610-mergetool: use test_cmp instead of test $(cat file) = $txt | Johannes Sixt | 2019-06-12 | 1 | -45/+90 |
| * | | | | | | | | | | | | t7610-mergetool: do not place pipelines headed by `yes` in subshells | Johannes Sixt | 2019-06-10 | 1 | -85/+85 |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'tm/tag-gpgsign-config' | Junio C Hamano | 2019-07-10 | 1 | -0/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | tag: add tag.gpgSign config option to force all tags be GPG-signed | Tigran Mkrtchyan | 2019-06-05 | 1 | -0/+21 |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'fc/fetch-with-import-fix' | Junio C Hamano | 2019-07-10 | 2 | -13/+27 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | fetch: fix regression with transport helpers | Felipe Contreras | 2019-06-04 | 1 | -1/+1 |
| * | | | | | | | | | | | | t5801 (remote-helpers): add test to fetch tags | Felipe Contreras | 2019-06-04 | 1 | -0/+10 |
| * | | | | | | | | | | | | t5801 (remote-helpers): cleanup refspec stuff | Felipe Contreras | 2019-06-04 | 1 | -4/+4 |
* | | | | | | | | | | | | | Merge branch 'nb/branch-show-other-worktrees-head' | Junio C Hamano | 2019-07-10 | 3 | -7/+66 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | branch: add worktree info on verbose output | Nickolai Belakovski | 2019-05-07 | 1 | -0/+19 |
| * | | | | | | | | | | | | | branch: update output to include worktree info | Nickolai Belakovski | 2019-05-07 | 2 | -7/+33 |