Folding commits together

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



I've made a couple of trivial commits I'd like to fold into a single commit now. 
In the manpage of git-rebase I saw a recipe how to do it using rebase -i and it 
seemed quite trivial, but it doesn't work for me. I'm in a clean state on branch 
master and want fold the last 3 commits into one - this is probably the most 
trivial use case. Whatever I try I get an empty .git/rebase-merge/git-rebase-
todo, so I can't get to the point of using <<If you want to fold two or more 
commits into one, replace the command "pick" for the second and subsequent 
commits with "squash" or "fixup".>>

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]