summaryrefslogtreecommitdiff
path: root/t/t3200-branch.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nb/branch-show-other-worktrees-head'Junio C Hamano2019-07-091-5/+11
|\
| * branch: update output to include worktree infoNickolai Belakovski2019-05-071-5/+11
* | Merge branch 'dl/branch-from-3dot-merge-base'Junio C Hamano2019-05-191-4/+10
|\ \
| * | branch: make create_branch accept a merge base revDenton Liu2019-05-071-4/+10
| |/
* | worktree: update is_bare heuristicsJonathan Tan2019-04-211-0/+24
|/
* t/*: fix ordering of expected/observed argumentsMatthew DeVore2018-10-071-1/+1
* branch: support configuring --sort via .gitconfigSamuel Maftoul2018-08-161-0/+46
* t: switch "branch -l" to "branch --create-reflog"Jeff King2018-06-221-17/+17
* t3200: unset core.logallrefupdates when testing reflog creationJeff King2018-06-221-1/+1
* Merge branch 'ks/branch-set-upstream'Junio C Hamano2018-06-181-1/+1
|\
| * t3200: clarify description of --set-upstream testKaartic Sivaraam2018-06-181-1/+1
* | Merge branch 'cc/tests-without-assuming-ref-files-backend'Junio C Hamano2018-06-011-9/+9
|\ \
| * | t: make many tests depend less on the refs being filesDavid Turner2018-05-231-9/+9
* | | t: switch $_z40 to $ZERO_OIDbrian m. carlson2018-05-141-2/+2
* | | t3200: verify "branch --list" sanity when rebasing from detached HEADEric Sunshine2018-04-051-0/+24
|/ /
* | Merge branch 'ks/t3200-typofix'Junio C Hamano2018-03-211-1/+1
|\ \
| * | t/t3200: fix a typo in a test descriptionks/t3200-typofixKaartic Sivaraam2018-03-151-1/+1
* | | refs_resolve_ref_unsafe: handle d/f conflicts for writesjk/refs-df-conflictJeff King2017-10-071-0/+10
* | | Merge branch 'sd/branch-copy'Junio C Hamano2017-10-031-0/+256
|\ \ \
| * | | branch: fix "copy" to never touch HEADJunio C Hamano2017-09-241-5/+5
| |/ /
| * | branch: add a --copy (-c) option to go with --move (-m)Sahil Dua2017-06-181-0/+215
| * | branch: add test for -m renaming multiple config sectionsÆvar Arnfjörð Bjarmason2017-06-181-0/+41
| * | Merge branch 'sd/t3200-typofix'Junio C Hamano2017-06-041-1/+1
| |\ \
* | \ \ Merge branch 'nd/worktree-kill-parse-ref'Junio C Hamano2017-09-101-0/+13
|\ \ \ \ | |_|_|/ |/| | |
| * | | branch: fix branch renaming not updating HEADs correctlynd/worktree-kill-parse-refNguyễn Thái Ngọc Duy2017-08-241-0/+13
* | | | builtin/branch: stop supporting the "--set-upstream" optionKaartic Sivaraam2017-08-171-45/+2
* | | | t3200: cleanup cruft of a testKaartic Sivaraam2017-08-171-0/+1
* | | | reflog-walk: stop using fake parentsJeff King2017-07-091-2/+1
* | | | reflog-walk: skip over double-null oid due to HEAD renameJeff King2017-07-051-0/+11
* | | | t3200: add test for single parameter passed to -m optionsd/t3200-branch-m-testSahil Dua2017-06-131-0/+17
* | | | Merge branch 'sd/t3200-typofix' into maintJunio C Hamano2017-06-051-1/+1
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | branch test: fix invalid config key accesssd/t3200-typofixSahil Dua2017-05-291-1/+1
* | | Merge branch 'ab/ref-filter-no-contains'Junio C Hamano2017-04-111-0/+4
|\ \ \ | |_|/ |/| |
| * | ref-filter: make combining --merged & --no-merged an errorÆvar Arnfjörð Bjarmason2017-03-211-0/+4
* | | Merge branch 'kn/ref-filter-branch-list'Junio C Hamano2017-03-141-0/+25
|\ \ \ | |/ / |/| |
| * | branch: honor --abbrev/--no-abbrev in --list modeJunio C Hamano2017-03-101-0/+25
| |/
* | branch: record creation of renamed branch in HEAD's logkm/delete-ref-reflog-messageKyle Meyer2017-02-201-2/+3
* | rename_ref: replace empty message in HEAD's logKyle Meyer2017-02-201-0/+5
|/
* Merge branch 'mh/split-under-lock'Junio C Hamano2016-07-251-0/+9
|\
| * refs: don't dereference on renameDavid Turner2016-06-131-0/+9
* | tests: use test_i18n* functions to suppress false positivesVasco Almeida2016-06-171-3/+3
|/
* Merge branch 'ky/branch-m-worktree'Junio C Hamano2016-04-181-1/+22
|\
| * branch -m: update all per-worktree HEADsKazuki Yamaguchi2016-04-041-1/+22
* | branch -d: refuse deleting a branch which is currently checked outky/branch-d-worktreeKazuki Yamaguchi2016-03-291-0/+6
|/
* branch: die on config error when unsetting upstreamPatrick Steinhardt2016-02-221-0/+7
* branch: report errors in tracking branch setupPatrick Steinhardt2016-02-221-1/+8
* tests: remove some direct access to .git/logsdt/reflog-testsDavid Turner2015-07-281-6/+6
* Merge branch 'mg/branch-d-m-f'Junio C Hamano2014-12-221-0/+14
|\
| * branch: allow -f with -m and -dmg/branch-d-m-fMichael J Gruber2014-12-091-0/+5
| * t3200-branch: test -MMichael J Gruber2014-12-041-0/+9