summaryrefslogtreecommitdiff
path: root/t/t3200-branch.sh
Commit message (Expand)AuthorAgeFilesLines
* 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
* | branch -d: avoid repeated symref resolutionJonathan Nieder2014-10-151-0/+9
|/
* Merge branch 'dt/tests-with-env-not-subshell'Junio C Hamano2014-03-311-10/+2
|\
| * tests: use "env" to run commands with temporary env-var settingsdt/tests-with-env-not-subshellDavid Tran2014-03-191-10/+2
* | t3200-branch: test setting branch as own upstreamBrian Gesiak2014-03-061-0/+10
|/
* Merge branch 'js/test-help-format-windows-port-fix'Junio C Hamano2013-11-011-1/+1
|\
| * t3200: do not open a HTML manual page when DEFAULT_MAN_FORMAT is htmljs/test-help-format-windows-port-fixJohannes Sixt2013-10-301-1/+1
* | Merge branch 'jh/checkout-auto-tracking'Junio C Hamano2013-09-201-1/+37
|\ \ | |/
| * t3200: fix failure on case-insensitive filesystemsjh/checkout-auto-trackingEric Sunshine2013-09-171-0/+1
| * branch.c: Relax unnecessary requirement on upstream's remote ref namePer Cederqvist2013-09-091-1/+1
| * t3200: Add test demonstrating minor regression in 41c21f2Johan Herland2013-09-091-0/+34
| * t3200: Minor fix when preparing for tracking failureJohan Herland2013-09-091-1/+2
* | t: branch: fix broken && chainsfc/t3200-fixesFelipe Contreras2013-09-031-4/+4
* | t: branch: fix typoFelipe Contreras2013-09-031-1/+1
* | t: branch: trivial style fixFelipe Contreras2013-09-031-1/+2
|/
* branch.c: Validate tracking branches with refspecs instead of refs/remotes/*Johan Herland2013-04-211-1/+1
* t3200.39: tracking setup should fail if there is no matching refspec.Johan Herland2013-04-211-4/+4
* Merge branch 'jk/set-upstream-error-cases'Junio C Hamano2013-04-071-0/+12
|\
View Lorry Controller Status