gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-27 19:50:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4510 from gitbutlerapp/rename-trunk-to-target

Browse Source 
rename Trunk to Target in the UI
This commit is contained in:
Kiril Videlov 2024-07-27 19:39:25 +02:00 committed by GitHub
commit 52e6588dcc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/desktop/src/lib/components/ProjectSetupTarget.svelte
View File

@ -81,7 +81,7 @@
<div class="project-setup"> <div class="project-setup">
<div class="project-setup__info"> <div class="project-setup__info">
<ProjectNameLabel {projectName} /> <ProjectNameLabel {projectName} />
<h3 class="text-base-body-14 text-bold">Target trunk branch</h3> <h3 class="text-base-body-14 text-bold">Target branch</h3>
</div> </div>
<div class="project-setup__fields"> <div class="project-setup__fields">

7
apps/desktop/src/lib/navigation/BaseBranchCard.svelte
View File

@ -21,7 +21,7 @@
</script> </script>
<button <button
use:tooltip={isNavCollapsed ? 'Trunk' : ''} use:tooltip={isNavCollapsed ? 'Target' : ''}
on:mousedown={async () => await goto(`/${project.id}/base`)} on:mousedown={async () => await goto(`/${project.id}/base`)}
class="base-branch-card" class="base-branch-card"
class:selected class:selected
@ -39,7 +39,10 @@
{#if !isNavCollapsed} {#if !isNavCollapsed}
<div class="content"> <div class="content">
<div class="button-head"> <div class="button-head">
<span class="text-base-14 text-semibold trunk-label">Trunk</span> <span
use:tooltip={'The branch that your Workspace virtual branches are based on and will be merged into.'}
class="text-base-14 text-semibold trunk-label">Target</span
>
{#if ($base?.behind || 0) > 0} {#if ($base?.behind || 0) > 0}
<Badge count={$base?.behind || 0} help="Unmerged upstream commits" /> <Badge count={$base?.behind || 0} help="Unmerged upstream commits" />
{/if} {/if}

4
apps/desktop/src/lib/settings/PreferencesForm.svelte
View File

@ -228,8 +228,8 @@
<SectionCard orientation="row" labelFor="allowForcePush"> <SectionCard orientation="row" labelFor="allowForcePush">
<svelte:fragment slot="title">Allow force pushing</svelte:fragment> <svelte:fragment slot="title">Allow force pushing</svelte:fragment>
<svelte:fragment slot="caption"> <svelte:fragment slot="caption">
Force pushing allows GitButler to override branches even if they were pushed to remote. We Force pushing allows GitButler to override branches even if they were pushed to remote.
will never force push to the trunk. GitButler will never force push to the target branch.
</svelte:fragment> </svelte:fragment>
<svelte:fragment slot="actions"> <svelte:fragment slot="actions">
<Toggle <Toggle

4
apps/desktop/src/routes/settings/experimental/+page.svelte
View File

@ -15,8 +15,8 @@
<SectionCard labelFor="baseBranchSwitching" orientation="row"> <SectionCard labelFor="baseBranchSwitching" orientation="row">
<svelte:fragment slot="title">Switching the target branch</svelte:fragment> <svelte:fragment slot="title">Switching the target branch</svelte:fragment>
<svelte:fragment slot="caption"> <svelte:fragment slot="caption">
This allows changing of the target branch (trunk) after the initial project setup from within This allows changing of the target branch after the initial project setup from within the
the project settings. Not fully tested yet, use with caution. project settings. Not fully tested yet, use with caution.
</svelte:fragment> </svelte:fragment>
<svelte:fragment slot="actions"> <svelte:fragment slot="actions">
<Toggle <Toggle