On Thu, Sep 5, 2013 at 11:03 PM, Saurabh Jha saurabh.j...@gmail.com wrote:
I am not able to do it. Can you get me some man page for this?
git diff --help
What you want to do is something like:
git diff master p
git checkout master
git checkout -b new_branch
patch -p1 p
You can read help
On Thu, Sep 5, 2013 at 11:14 AM, Saurabh Jha saurabh.j...@gmail.com wrote:
Hi,
I am done with level 0 of matrices. Aaron has told me to squash the commits
of [1] but I am not able to get it to work. Please help me here because I
Just do:
git rebase -i master
and for commits that you want
Hi,
I am done with level 0 of matrices. Aaron has told me to squash the commits
of [1] but I am not able to get it to work. Please help me here because I
think the code is in good shape now. I would also request someone to please
have a look at [2].
-Saurabh
[1]
Hi Ondrej,
I tried this. This is the output
error: could not apply 44365bf... Following are the changes and enhancement
proposed in this PR.
When you have resolved this problem run git rebase --continue.
If you would prefer to skip this patch, instead run git rebase --skip.
To check out the
On Thu, Sep 5, 2013 at 11:27 AM, Saurabh Jha saurabh.j...@gmail.com wrote:
Hi Ondrej,
I tried this. This is the output
error: could not apply 44365bf... Following are the changes and enhancement
proposed in this PR.
When you have resolved this problem run git rebase --continue.
If you
Squashing a bunch of commits like this isn't very effective in my
experience, because git tries to do them one at a time, which tends to
lead to a bunch of unnecessary conflicts. If you want just one
commit, it's easier to just get the diff and apply it manually. Unless
you know of a better way.
I am not able to do it. Can you get me some man page for this?
On Friday, September 6, 2013 5:31:53 AM UTC+5:30, Aaron Meurer wrote:
Squashing a bunch of commits like this isn't very effective in my
experience, because git tries to do them one at a time, which tends to
lead to a bunch of
