summaryrefslogtreecommitdiff
path: root/t/t3200-branch.sh
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * t3200: test --set-upstream-to with bogus refsJeff King2013-04-021-0/+12
* | Merge branch 'jm/branch-rename-nothing-error'Junio C Hamano2013-04-031-1/+1
|\ \ | |/ |/|
| * branch: give better message when no names specified for renameJonathon Mah2013-03-311-1/+1
* | Merge branch 'rr/test-3200-style'Junio C Hamano2013-04-011-253/+267
|\ \ | |/ |/|
| * t3200 (branch): modernize styleRamkumar Ramachandra2013-03-201-233/+244
* | branch: segfault fixes and validationNguyễn Thái Ngọc Duy2013-02-231-0/+21
|/
* branch: give a more helpful message on redundant argumentsNguyễn Thái Ngọc Duy2013-01-301-2/+2
* branch: show targets of deleted symrefs, not sha1sRené Scharfe2012-10-181-3/+2
* branch: skip commit checks when deleting symref branchesRené Scharfe2012-10-181-0/+9
* branch: delete symref branch, not its targetRené Scharfe2012-10-181-0/+11
* Merge branch 'cn/branch-set-upstream-to'Junio C Hamano2012-09-101-0/+70
|\
| * branch: deprecate --set-upstream and show help if we detect possible mistaken...Carlos Martín Nieto2012-08-301-0/+34
| * branch: add --unset-upstream optionCarlos Martín Nieto2012-08-301-0/+22
| * branch: introduce --set-upstream-toCarlos Martín Nieto2012-08-231-0/+14
* | Fix tests under GETTEXT_POISON on parseoptJiang Xin2012-08-271-2/+2
|/
* Merge branch 'nd/columns'Junio C Hamano2012-05-031-0/+77
|\
| * branch: add --columnNguyễn Thái Ngọc Duy2012-04-271-0/+77
* | Merge branch 'cn/maint-branch-with-bad'Junio C Hamano2012-03-011-0/+4
|\ \ | |/ |/|
| * branch: don't assume the merge filter ref existscn/maint-branch-with-badCarlos Martín Nieto2012-02-271-0/+4
* | branch --edit-description: protect against mistyped branch namejc/branch-desc-typoavoidanceJunio C Hamano2012-02-051-4/+37
* | Merge branch 'rr/test-chaining'Junio C Hamano2011-12-191-2/+2
|\ \ | |/ |/|
View Lorry Controller Status