On 07/01/12 09:31, Anton Khirnov wrote:
On Sat, 07 Jan 2012 00:07:41 -0800, Mike Melanson<[email protected]> wrote:
I made 6 commits to my local tree tonight. Unfortunately, I made the
first 2 commits, then pulled from the master, then made the other 4.
Do git pull --rebase to avoid this in the future.
I'm
trying to ask 'git format-patch' to create patch files for only my 6
commits. Is there a way to neatly format a set of my 6 patches? Or do I
just accept this as git's way of punishing me for my ignorance and
format 2 separate bundles (I have figured out 'git format-patch
<range_start>..<range_end>')?
git rebase -i origin/master
rearrange the commits so that your patches are at the end
profit
git pull --rebase can fix the issue as well.
lu
--
Luca Barbato
Gentoo/linux
http://dev.gentoo.org/~lu_zero
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
