User Tools

Site Tools


dev:kb:version_control

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revisionPrevious revision
Next revision
Previous revision
Last revisionBoth sides next revision
dev:kb:version_control [2014/05/05 14:30] – [Official p4 document] hackerzhoudev:kb:version_control [2015/01/18 04:14] – [Delete a changelist] hackerzhou
Line 35: Line 35:
 ==== Delete a changelist ==== ==== Delete a changelist ====
 <code> <code>
 +p4 revert -c changelist# //...
 p4 change -d changelist# p4 change -d changelist#
 </code> </code>
Line 45: Line 46:
 ==== See pending/submitted changes ==== ==== See pending/submitted changes ====
 <code> <code>
-p4 changes -u $USERNAME -c $P4CLIENT -s $STATUS(pending, submitted, shelved)+p4 changes -u $P4USER -c $P4CLIENT -s $STATUS(pending, submitted, shelved)
 </code> </code>
  
Line 99: Line 100:
  
 ===== Git ===== ===== Git =====
 +=== GUI client ====
 +  * [[http://gitk.sourceforge.net/|gitk]] - graphical history browser, in Tcl/Tk, distributed with Git (usually in gitk package)
 +  * [[http://www.kernel.org/pub/software/scm/git/docs/git-gui.html|git gui]] - graphical commit tool, in Tcl/Tk, distributed with Git (usually in git-gui package)
 +  * [[http://digilander.libero.it/mcostalba/|QGit]] - uses Qt toolkit
 +  * [[https://wiki.gnome.org/Apps/giggle|Giggle]] - uses GTK+ toolkit
 +  * [[http://cola.tuxfamily.org/|git-cola]] - uses PyQt4
 +  * [[http://git.gnome.org/cgit/gitg/|gitg]] - GTK+/GNOME clone of GitX
 +  * [[http://jonas.nitro.dk/tig/|tig]] - text mode interface for git, is GUI and pager, uses ncurses
 +  * [[https://sites.google.com/site/gitforcetool/home|GitForce]] Git tool with Graphical user interface, available under GNU GPL license
 +==== Git clone specified branch ====
 +<code bash>
 +git clone {URL} -b master
 +</code>
  
 +==== Git switch branch ====
 +<code bash>
 +git checkout dev
 +</code>
 +
 +==== Git delete local branch ====
 +<code bash>
 +git branch -d test_branch
 +</code>
 +
 +==== Git delete remote branch ====
 +<code bash>
 +git push origin :test_branch
 +</code>
 +
 +==== Git push branch to remote ====
 +<code>
 +git push -u origin new_branch
 +</code>
 ===== SVN ===== ===== SVN =====
  
  
dev/kb/version_control.txt · Last modified: 2020/06/06 23:32 by 127.0.0.1