On Jan 10, 4:51 pm, Thomas Ferris Nicolaisen <tfn...@gmail.com> wrote:
> You're better off thinking about the *commits* that you want to pull into
> the current branch.
>
> One way is to cherry-pick the commits where you added the files:
>
> git cherry-pick <sha>
>
> This is nice if you want to pull in a single commit or two.
>
> Alternatively, if you want to dive into more the more advanced rebase --onto
> technique, have a look at:
>
> http://learn.github.com/p/rebasing.html
>
> See the section "more interesting rebases". That's tricky stuff though, you
> probably want to play around and learn more about git-rebase before you get
> there.

Advertising

Thanks! I was thinking that the cherry-pick might be my best bet as
well.
I'm going to read over the "rebase" and see if that may be the way to
go for the future and play with it like you said before using that
approach.
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/git-users?hl=en.