summaryrefslogtreecommitdiffstats
path: root/t (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/switch-and-restore'Junio C Hamano2019-07-109-73/+387
|\
| * t2027: use test_must_be_emptyNguyễn Thái Ngọc Duy2019-06-201-3/+2
| * doc: promote "git restore"Nguyễn Thái Ngọc Duy2019-05-072-51/+51
| * t: add tests for restoreNguyễn Thái Ngọc Duy2019-05-073-0/+221
| * doc: promote "git switch"Nguyễn Thái Ngọc Duy2019-04-021-12/+12
| * t: add tests for switchNguyễn Thái Ngọc Duy2019-04-021-0/+96
| * switch: no worktree status unless real branch switch happensNguyễn Thái Ngọc Duy2019-04-021-14/+0
| * checkout: advice how to get out of detached HEAD modeNguyễn Thái Ngọc Duy2019-04-021-0/+12
| * t: rename t2014-switch.sh to t2014-checkout-switch.shNguyễn Thái Ngọc Duy2019-04-021-0/+0
* | Merge branch 'jk/oidhash'Junio C Hamano2019-07-101-3/+3
|\ \
| * | object: convert lookup_unknown_object() to use object_idJeff King2019-06-201-3/+3
* | | Merge branch 'nd/fetch-multi-gc-once'Junio C Hamano2019-07-101-2/+5
|\ \ \
| * | | fetch: only run 'gc' once when fetching multiple remotesNguyễn Thái Ngọc Duy2019-06-201-2/+5
* | | | Merge branch 'es/rev-list-no-object-names'Junio C Hamano2019-07-101-0/+20
|\ \ \ \
| * | | | rev-list: teach --no-object-names to enable pipingEmily Shaffer2019-06-201-0/+20
* | | | | Merge branch 'dl/includeif-onbranch'Junio C Hamano2019-07-101-0/+39
|\ \ \ \ \
| * | | | | config: learn the "onbranch:" includeIf conditionDenton Liu2019-06-051-0/+39
* | | | | | Merge branch 'pw/rebase-abort-clean-rewritten'Junio C Hamano2019-07-101-1/+17
|\ \ \ \ \ \
| * | | | | | rebase --abort/--quit: cleanup refs/rewrittenPhillip Wood2019-05-151-1/+17
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'am/p4-branches-excludes'Junio C Hamano2019-07-102-5/+178
|\ \ \ \ \ \
| * | | | | | git-p4: respect excluded paths when detecting branchesMazo, Andrey2019-04-021-1/+1
| * | | | | | git-p4: add failing test for "git-p4: respect excluded paths when detecting b...Mazo, Andrey2019-04-021-0/+40
| * | | | | | git-p4: don't exclude other files with same prefixMazo, Andrey2019-04-021-2/+2
| * | | | | | git-p4: add failing test for "don't exclude other files with same prefix"Mazo, Andrey2019-04-021-5/+46
| * | | | | | git-p4: match branches case insensitively if configuredMazo, Andrey2019-04-021-2/+2
| * | | | | | git-p4: add failing test for "git-p4: match branches case insensitively if co...Mazo, Andrey2019-04-021-0/+92
* | | | | | | Merge branch 'tg/stash-ref-by-index-fix'Junio C Hamano2019-07-101-0/+18
|\ \ \ \ \ \ \
| * | | | | | | stash: fix show referencing stash indexThomas Gummerer2019-06-191-0/+18
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jk/trailers-use-config'Junio C Hamano2019-07-101-27/+44
|\ \ \ \ \ \ \
| * | | | | | | interpret-trailers: load default configJeff King2019-06-191-27/+44
* | | | | | | | Merge branch 'js/t3404-typofix'Junio C Hamano2019-07-101-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | t3404: fix a typoJohannes Schindelin2019-06-141-1/+1
* | | | | | | | | Merge branch 'pw/add-p-recount'Junio C Hamano2019-07-101-0/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add -p: fix checkout -p with pathological contextPhillip Wood2019-06-131-0/+8
* | | | | | | | | | Merge branch 'ds/commit-graph-write-refactor'Junio C Hamano2019-07-101-0/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | commit-graph: return with errors during writeDerrick Stolee2019-06-121-0/+8
* | | | | | | | | | | Merge branch 'sg/trace2-rename'Junio C Hamano2019-07-101-1/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Revert "test-lib: whitelist GIT_TR2_* in the environment"Ævar Arnfjörð Bjarmason2019-06-121-1/+0
* | | | | | | | | | | | Merge branch 'js/mergetool-optim'Junio C Hamano2019-07-101-132/+177
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t7610-mergetool: use test_cmp instead of test $(cat file) = $txtJohannes Sixt2019-06-121-45/+90
| * | | | | | | | | | | | t7610-mergetool: do not place pipelines headed by `yes` in subshellsJohannes Sixt2019-06-101-85/+85
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'tm/tag-gpgsign-config'Junio C Hamano2019-07-101-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | tag: add tag.gpgSign config option to force all tags be GPG-signedTigran Mkrtchyan2019-06-051-0/+21
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fc/fetch-with-import-fix'Junio C Hamano2019-07-102-13/+27
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fetch: fix regression with transport helpersFelipe Contreras2019-06-041-1/+1
| * | | | | | | | | | | | t5801 (remote-helpers): add test to fetch tagsFelipe Contreras2019-06-041-0/+10
| * | | | | | | | | | | | t5801 (remote-helpers): cleanup refspec stuffFelipe Contreras2019-06-041-4/+4
* | | | | | | | | | | | | Merge branch 'nb/branch-show-other-worktrees-head'Junio C Hamano2019-07-103-7/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | branch: add worktree info on verbose outputNickolai Belakovski2019-05-071-0/+19
| * | | | | | | | | | | | | branch: update output to include worktree infoNickolai Belakovski2019-05-072-7/+33