On 01/12/2010 03:11 PM, Bill Peck wrote:
On 01/12/2010 04:21 AM, Marian Csontos wrote:
> On 01/11/2010 09:18 PM, Bill Peck wrote:
>> Hello Everyone,
>>
>> FYI - Just to keep things clean I've been deleting RFE and bugfix
>> branches after merging them into master. Obviously I won't delete any
>> stable branches (we only have master right now).
> If anyone would like to keep branch's history, it is possible to use
> rebase instead of merge, just do:
> git pull --merge
^^^^^
This should be
git pull --rebase
of course.
>
Can you explain in more detail how this would work and what the
differences are?
I was told you should *NOT* use rebase if you are sharing your repo.
In fact, I thought rebase removed history.
Partially correct. Before publishing
changes, you can do pretty much
anything including rewriting history.
It is the history on the server which counts.
You can run
git pull --rebase
[ which applies changes between origin..HEAD on top of branch ]
and, after solving any conflicts, run
git push
This way, one will get rid of the branch as well as keep all the history.
See
man git-rebase
for details.
<Advertising-message>
Sometimes it is undesirable to keep history as is, and
git rebase -i
allows you to split/join/reorder commits before pushing them.
I love it.
-- Marian
> -- Marian
>> -Bill
>> _______________________________________________
>> Beaker-devel mailing list
>> Beaker-devel(a)lists.fedorahosted.org
>>
https://fedorahosted.org/mailman/listinfo/beaker-devel
>