ParaView/Git/Maintain: Difference between revisions
From KitwarePublic
Jump to navigationJump to search
(Created page with "__NOTOC__ This page documents how to maintain ParaView branches through [http://git-scm.com Git]. See our table of contents for more information. ==Merging nex...") |
No edit summary |
||
| Line 27: | Line 27: | ||
:<code>$ ./Utilities/SetupForDevelopment.sh</code> | :<code>$ ./Utilities/SetupForDevelopment.sh</code> | ||
|} | |} | ||
==Miscellaneous Commands== | |||
* Show branches merged in next or master on stage | |||
:<code>$ git fetch stage -p</code> | |||
:<code>$ git branch -r --merged stage/next | grep stage</code> | |||
:<code>$ git branch -r --merged stage/master | grep stage</code> | |||
* Find the SHA1 for the VTK submodule that a branch is referring to. | |||
:<code>$ git ls-tree <branchname> VTK | awk '{print $3}'</code> | |||
Revision as of 00:42, 28 September 2012
This page documents how to maintain ParaView branches through Git.
See our table of contents for more information.
Merging next topics into master
Before you begin, perform initial setup:
|
1. | |
|
2. | |
|
|
|
3. | |
|
Miscellaneous Commands
- Show branches merged in next or master on stage
$ git fetch stage -p$ git branch -r --merged stage/next | grep stage$ git branch -r --merged stage/master | grep stage
- Find the SHA1 for the VTK submodule that a branch is referring to.
$ git ls-tree <branchname> VTK | awk '{print $3}'
