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 9 changed 2 lines
| How many commits to squash | {{{g rcm}}} | {{{git rev-list --count master..}}}
| Rebase your branch from HEAD[2] | {{{grbi HEAD~$Y}}} | {{{git rebase -i HEAD~$Y}}}
| Squash against master | {{{g rbim}}}[1][2] | {{{git rebase -i HEAD~$(git rev-list --count master..);
}}}
| Squash against another branch | {{{g rbi $branch_name}}}[3] | {{{git rebase -i HEAD~$(git rev-list --count ${1}..);
}}}
At line 15 changed one line
[#1] custom alias
{{.gitconfig}} syntax:
At line 17 changed one line
[#2] {{$Y}} is displayed in GitLab at the top, where it says ''Overview: X, Commits: Y, Pipelines: Z, ...'' . The number you want is Y.
[#1] {{{rbim = "!f() { git rebase -i HEAD~$(git rev-list --count master..); }; f"}}}
At line 21 added 4 lines
[#2] {{{rbin}}} if using main instead of master
[#3] {{{rbi = "!f() { git rebase -i HEAD~$(git rev-list --count ${1}..); }; f"}}}
At line 29 added 2 lines
Assuming you are currently in {{$branch_name}},
At line 26 changed one line
| Checkout branch | {{{gco $branch_name}}} | {{{git checkout $branch_name}}}
| Checkout branch | {{{gco @{-1} }}}[3] | {{{git checkout @{-1} }}}
At line 41 added 2 lines
[#3] references the most recent branch, {{{$branch_name}}}
At line 43 changed one line
[CategoryComputing.SCM.Git]
[CategoryComputing.SCM.Git] - [CategoryFrequent]
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