Git Branch Usage

This page (revision-22) was last changed on 13-Oct-2021 18:43 by arcoleo

This page was created on 31-Mar-2020 17:25 by arcoleo

Only authorized users are allowed to rename pages.

Only authorized users are allowed to delete pages.

Page revision history

Version Date Modified Size Author Changes ... Change note
22 13-Oct-2021 18:43 1 KB arcoleo to previous
21 13-Jul-2021 19:34 1 KB arcoleo to previous | to last

Page References

Incoming links Outgoing links
Git Branch Usage ...nobody
Git Branch Usage

Version management

Difference between version and

At line 7 changed 3 lines
|| Description || Zsh || Git
| Checkout branch | {{{gco $branch_name}}} | {{{git checkout $branch_name}}}
| Squash against master | {{{g rbim}}}[1][2] | {{{git rebase -i HEAD~$(git rev-list --count master..);
!! Checkout your branch
{{{
omz> gco $branch_name
zsh> git checkout $branch_name
At line 11 removed 5 lines
| Squash against another branch | {{{g rbi $branch_name}}}[3] | {{{git rebase -i HEAD~$(git rev-list --count ${1}..);
}}}
| Force push your branch | {{{ggfl}}} | {{{git push
--force-with-lease
origin $current_branch}}}
At line 17 changed one line
{{.gitconfig}} syntax:
!! Rebase your branch from HEAD
At line 19 changed one line
[#1] {{{rbim = "!f() { git rebase -i HEAD~$(git rev-list --count master..); }; f"}}}
{{$number_of_commits}} is displayed in GitLab at the top, where it says
At line 21 changed one line
[#2] {{{rbin}}} if using main instead of master
Overview: X, Commits: Y, Pipelines: Z, ...
At line 23 changed one line
[#3] {{{rbi = "!f() { git rebase -i HEAD~$(git rev-list --count ${1}..); }; f"}}}
The number you want is Y.
At line 22 added 12 lines
{{{
omz> grbi HEAD~5
zsh> git rebase -i HEAD~$number_of_commits
}}}
!! Force push your branch
{{{
omz> ggfl
zsh> git push --force-with-lease origin $current_branch
}}}
At line 29 changed one line
Assuming you are currently in {{$branch_name}},
!! Checkout master
At line 31 changed 9 lines
|| Description || Zsh || Git
| Checkout master | {{{gcm}}} | {{{git checkout master}}}
| Pull | {{{gl}}} | {{{git pull}}}
| Checkout branch | {{{gco @{-1} }}}[3] | {{{git checkout @{-1} }}}
| Rebase from master | {{{grbm}}} | {{{git rebase master}}}
| Handle conflicts, test, etc.
| Force push {{{$current_branch}}} to remote | {{{ggfl}}} | {{{git push
--force-with-lease
origin $current_branch}}}
{{{
omz> gcm
zsh> git checkout master
}}}
At line 41 changed one line
[#3] references the most recent branch, {{{$branch_name}}}
!! Pull
At line 47 added 30 lines
{{{
omz> gl
zsh> git pull
}}}
!! Checkout branch
{{{
omz> gco $branch_name
zsh> git checkout $branch_name
}}}
!! Rebase from master
{{{
omz> grbm
zsh> git rebase master
}}}
Handle conflicts, test, etc.
!! Force push
Force push {{$current_branch}} to remote.
{{{
omz> ggfl
zsh> git push --force-with-lease origin $current_branch
}}}
At line 47 changed 4 lines
|| Description || Zsh || Git
| Checkout master | {{{gcm}}} | {{{git checkout master}}}
| Merge feature branch into master | {{{gm $feature_branch}}} | {{{git merge $feature_branch}}}
| Push master| {{{ggp}}} | {{{git push origin master}}}
!! Checkout master
At line 83 added 19 lines
{{{
omz> gcm
zsh> git checkout master
}}}
!! Merge feature branch into master
{{{
omz> gm $feature_branch
zsh> git merge $feature_branch
}}}
!! Push master
{{{
omz> ggp
zsh> git push origin master
}}}
At line 53 changed one line
[CategoryComputing.SCM.Git] - [CategoryFrequent]
[CategoryComputing.SCM.Git]
This page (revision-22) was last changed on 13-Oct-2021 18:43 by arcoleo Top

Main

All Categories

Archived

Computing

Food
General
Geographic
Recreation


Index
About
JSPWiki v2.11.0-M4