This is the mail archive of the archer@sourceware.org mailing list for the Archer project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [Archer] Remote repository and git push command


On Fri, 11 Mar 2011 11:32:15 +0100, Pierre Muller wrote:
>   As I don't expect this for now, 
> I tried to push my locally rebased files:
> 
> $ git push  --force
> error: failed to push some refs to 'ssh://sourceware.org/git/archer.git'

FYI I just `git merge origin/master'.  When one wants to get a single diff
`git diff origin/master'.  For log of all the changes not cluttered by
upstream changes `git log --no-merges --first-parent'.  For preparing a submit
upstream in a split form I use some inappropriate different scripts, though.

This makes the changes linear with no problems for pull/push and no need for
--force.


Regards,
Jan


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]