projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d344532
)
Fix refspecs in given example for git subtree pull.
author
Arlen Cuss
<celtic@sairyx.org>
Tue, 19 Jan 2010 19:51:19 +0000
(12:51 -0700)
committer
Avery Pennarun
<apenwarr@gmail.com>
Tue, 2 Feb 2010 15:23:26 +0000
(10:23 -0500)
(Updated slightly by apenwarr)
git-subtree.txt
patch
|
blob
|
history
diff --git
a/git-subtree.txt
b/git-subtree.txt
index e7ce2d3654dcce65b2b983f3bc76bdd22ca939ec..9b2d48e334b2df98b6509ed778fe3d9a2764b177 100644
(file)
--- a/
git-subtree.txt
+++ b/
git-subtree.txt
@@
-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.git
gitweb-latest:
master
+ git@github.com:whatever/gitweb.git master
Or, using '--squash', you can actually rewind to an earlier
version of gitweb: