﻿<?xml version="1.0" encoding="utf-8" standalone="yes"?><rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/" xmlns:wfw="http://wellformedweb.org/CommentAPI/" xmlns:slash="http://purl.org/rss/1.0/modules/slash/"><channel><title>BlogJava-贝贝爸爸的程序人生-文章分类-GIT</title><link>http://www.blogjava.net/yuanqixun/category/48754.html</link><description>关注Seam、BPM</description><language>zh-cn</language><lastBuildDate>Tue, 13 Dec 2011 04:30:28 GMT</lastBuildDate><pubDate>Tue, 13 Dec 2011 04:30:28 GMT</pubDate><ttl>60</ttl><item><title>关于git分支的相关操作</title><link>http://www.blogjava.net/yuanqixun/articles/356770.html</link><dc:creator>贝贝爸爸</dc:creator><author>贝贝爸爸</author><pubDate>Thu, 18 Aug 2011 03:11:00 GMT</pubDate><guid>http://www.blogjava.net/yuanqixun/articles/356770.html</guid><wfw:comment>http://www.blogjava.net/yuanqixun/comments/356770.html</wfw:comment><comments>http://www.blogjava.net/yuanqixun/articles/356770.html#Feedback</comments><slash:comments>0</slash:comments><wfw:commentRss>http://www.blogjava.net/yuanqixun/comments/commentRss/356770.html</wfw:commentRss><trackback:ping>http://www.blogjava.net/yuanqixun/services/trackbacks/356770.html</trackback:ping><description><![CDATA[1、如果本地分支和远程分支由于改名了之后，造成无法正常push，这个时候对于master远端分支，你是无法删除的<br />
<div style="background-color:#eeeeee;font-size:13px;border:1px solid #CCCCCC;padding-right: 5px;padding-bottom: 4px;padding-left: 4px;padding-top: 4px;width: 98%;word-break:break-all"><!--<br />
<br />
Code highlighting produced by Actipro CodeHighlighter (freeware)<br />
http://www.CodeHighlighter.com/<br />
<br />
--><span style="color: #000000; ">git&nbsp;push&nbsp;</span><span style="color: #000000; ">-</span><span style="color: #000000; ">f&nbsp;origin</span></div>
以上加上-f之后，会强制进行远端的master提交，其他非master分支的更改直接<br />
<div style="background-color:#eeeeee;font-size:13px;border:1px solid #CCCCCC;padding-right: 5px;padding-bottom: 4px;padding-left: 4px;padding-top: 4px;width: 98%;word-break:break-all"><!--<br />
<br />
Code highlighting produced by Actipro CodeHighlighter (freeware)<br />
http://www.CodeHighlighter.com/<br />
<br />
--><span style="color: #000000; ">git&nbsp;push&nbsp;origin&nbsp;:issue</span><span style="color: #000000; ">-</span><span style="color: #000000; ">1</span></div>
<br />
2、本地跟踪分支如何删除<br />
<div style="background-color:#eeeeee;font-size:13px;border:1px solid #CCCCCC;padding-right: 5px;padding-bottom: 4px;padding-left: 4px;padding-top: 4px;width: 98%;word-break:break-all"><!--<br />
<br />
Code highlighting produced by Actipro CodeHighlighter (freeware)<br />
http://www.CodeHighlighter.com/<br />
<br />
--><span style="color: #000000; ">git&nbsp;branch&nbsp;</span><span style="color: #000000; ">-</span><span style="color: #000000;">r</span></div>
<br />
<div style="background-color:#eeeeee;font-size:13px;border:1px solid #CCCCCC;padding-right: 5px;padding-bottom: 4px;padding-left: 4px;padding-top: 4px;width: 98%;word-break:break-all"><!--<br />
<br />
Code highlighting produced by Actipro CodeHighlighter (freeware)<br />
http://www.CodeHighlighter.com/<br />
<br />
--><span style="color: #000000; ">dropbox</span><span style="color: #000000; ">/</span><span style="color: #000000; ">feature</span><span style="color: #000000; ">-</span><span style="color: #000000; ">bpm<br />
dropbox</span><span style="color: #000000; ">/</span><span style="color: #000000;">master<br />
</span><span style="color: red;">origin</span><span style="color: red;">/</span><span style="color: red;">HEAD&nbsp;</span><span style="color: red;">-&gt;</span><span style="color: red;">&nbsp;origin</span><span style="color: red;">/</span><span style="color: red;">master</span><span style="color: #000000;"><br />
origin</span><span style="color: #000000; ">/</span><span style="color: #000000; ">master</span></div>
看到没有，竟然是这样的！！！我不希望有这个跟踪分支<span style="color: #000000; ">origin</span><span style="color: #000000; ">/</span><span style="color: #000000; ">HEAD，怎么删？<br />上面那个分支origin/HEAD，我也不知道怎么出来的。不知道怎么删了。。。<br />---------------<br />晕死，上面那个的跟踪分支，直接到文件路径下删除即可！！<br /></span><div></div><img src ="http://www.blogjava.net/yuanqixun/aggbug/356770.html" width = "1" height = "1" /><br><br><div align=right><a style="text-decoration:none;" href="http://www.blogjava.net/yuanqixun/" target="_blank">贝贝爸爸</a> 2011-08-18 11:11 <a href="http://www.blogjava.net/yuanqixun/articles/356770.html#Feedback" target="_blank" style="text-decoration:none;">发表评论</a></div>]]></description></item></channel></rss>