Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Docs: when pushing to github, the repo path needs to end in .git
author
Avery Pennarun
<apenwarr@gmail.com>
Thu, 9 Jul 2009 00:17:31 +0000
(20:17 -0400)
committer
Avery Pennarun
<apenwarr@gmail.com>
Thu, 9 Jul 2009 00:17:31 +0000
(20:17 -0400)
Reported by Thell Fowler.
git-subtree.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
76a7356
)
diff --git
a/git-subtree.txt
b/git-subtree.txt
index 649cc3098909d44e1a17902d7fd8f3e7b7ef0c30..e7ce2d3654dcce65b2b983f3bc76bdd22ca939ec 100644
(file)
--- a/
git-subtree.txt
+++ b/
git-subtree.txt
@@
-241,7
+241,7
@@
the upstream. You could do this:
0a8f4f0^.. --onto=1130ef3 --rejoin \
--branch gitweb-latest
$ gitk gitweb-latest
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.")
(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 \
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:
Or, using '--squash', you can actually rewind to an earlier
version of gitweb: