[Kde-scm-interest] [PATCH] scripty draft 1

[Thomas Zander]

On Tuesday 26. May 2009 09.18.43 Chani wrote:
> -I'm not sure if I should rebase when I pull, just in case strange things
> have happened to the git repo. maybe only if the first pull fails?

The only commits you ever will create in this repo are the translation 
update right?
In that case --rebase will not be harmful since it will have no effect if you 
don't have any non-pushed commits.
In short;
* if the commits have to go back to svn, rebase is non-optional.
* if you made a change that rebase can't handle but merge would, then rebase 
is probably not wanted.

I bet you should just rebase to keep a clean and simple history.
-- 
Thomas Zander
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part.
Url : http://mail.kde.org/pipermail/kde-scm-interest/attachments/20090526/9c4a1efe/attachment-0001.sig