index cf094ca357758d147c9ab7684ef5abc7d15a50ef..87161aedd19bb7bebd0621fda6c381f9a936b7f5 100644 (file)
# with the appropriate name):
git reset --hard remotes/trunk
# You may only dcommit to one branch/tag/trunk at a time. The usage
-# of dcommit/rebase/show-ignore should be teh same as above.
+# of dcommit/rebase/show-ignore should be the same as above.
------------------------------------------------------------------------
REBASE VS. PULL/MERGE