DragonFly commits List (threaded) for 2008-11
DragonFly BSD
DragonFly commits List (threaded) for 2008-11
[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]

Re: DragonFly BSD source repository branch, master, updated. 7fc7e029e2b0bc155f8d694a0597ea3b2c27b761

From: "Simon 'corecode' Schubert" <corecode@xxxxxxxxxxxx>
Date: Sat, 29 Nov 2008 21:13:05 +0100

Nicolas Thery wrote:
- Log -----------------------------------------------------------------
commit 7fc7e029e2b0bc155f8d694a0597ea3b2c27b761
Merge: caf92acab6c7aff17107d1a7ce021a96761ef853 3f3f2646e1abbc95b6129e9fc6623fc9d23a1f74
Author: Nicolas Thery <nthery@gmail.com>
Date:   Fri Nov 28 13:16:55 2008 +0100

Merge branch 'master' of git://chlamydia.fs.ei.tum.de/dragonfly

commit caf92acab6c7aff17107d1a7ce021a96761ef853
Author: Nicolas Thery <nthery@gmail.com>
Date:   Fri Nov 28 13:12:21 2008 +0100

Test switch to git repo.

Damn, it didn't do exactly what I wanted.

Is there a way not to push merge commits? (the first one above)

What's wrong with merge commits?

Is committing directly to my local master branch a bad idea? Maybe I
should commit only on local
'topic' branches and use master as a read-only upstream reference.

That would have resulted in the same. The upstream reference is crater/master or origin/master, or so on.

# work
vim test/test/README

# check-in changes on local master branch
git add test/test/README
git commit

# register shortcut for crater
git remote add crater ssh://crater.dragonflybsd.org/repository/git/dragonfly.git

# try to push to crater
git push crater

good until here

# Git complains because Sephe pushed sth after I pulled

# Update
git pull corecode

The pull does a merge. You can switch off this automatic merging behavior (look at your .git/config)

What you could have done now would have been to rebase your master onto "corecode/master" (as you have called the dragonfly upstream repo "corecode".

Rebasing basically replays all your changesets onto a new position. This way you would not have produced a merge.

# push again
git push crater

cheers simon

  <3 the future  +++  RENT this banner advert  +++   ASCII Ribbon   /"\
  rock the past  +++  space for low €€€ NOW!1  +++     Campaign     \ /
Party Enjoy Relax   |   http://dragonflybsd.org      Against  HTML   \
Dude 2c 2 the max   !   http://golden-apple.biz       Mail + News   / \

[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]