@@ -241,7 +241,7 @@ the upstream. You could do this: 0a8f4f0^.. --onto=1130ef3 --rejoin \ --branch gitweb-latest $ gitk gitweb-latest - $ git push git@github.com:whatever/gitweb gitweb-latest:master + $ git push git@github.com:whatever/gitweb.git gitweb-latest:master (We use '0a8f4f0^..' because that means "all the changes from 0a8f4f0 to the current version, including 0a8f4f0 itself.") @@ -258,7 +258,7 @@ And you can merge changes back in from the upstream project just as easily: $ git subtree pull --prefix=gitweb \ - git@github.com:whatever/gitweb gitweb-latest:master + git@github.com:whatever/gitweb.git gitweb-latest:master Or, using '--squash', you can actually rewind to an earlier version of gitweb: git-subtree.txt 76a7356f56655dbcbbc9d472e0cdc85c6ed3759f Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/b64a7aa26c72fcae7b6e1decd88ed706c185cda7 b64a7aa26c72fcae7b6e1decd88ed706c185cda7 2009-07-08T17:17:31-07:00 2009-07-08T17:17:31-07:00 Docs: when pushing to github, the repo path needs to end in .git Reported by Thell Fowler. 96bb2a4df3a9ef4a584cce0e7402f55fd9f446b4 Avery Pennarun apenwarr@gmail.com