Re: More merge questions (why doesn't this work?)
- From
- Sven Verdoolaege <skimo@kotnet.org>
- Date
- Dec 2, 2005, 13:09 UTC
- Message-ID
- <20051202130911.GY8383MdfPADPa@greensroom.kotnet.org>
- In-Reply-To
- <7vacfj6c4l.fsf@assigned-by-dhcp.cox.net>
On Fri, Dec 02, 2005 at 02:12:42AM -0800, Junio C Hamano wrote:
Show 7 quoted lines
> linux@horizon.com writes: > > 3) Dumb question: why does "git-commit-tree" need "-p" before the > > parent commit arguments? Isn't just argv[2]..argv[argc-1] > > good enough? > > 3. It does not matter; nobody types that command by hand. >
I do. git commit won't let me commit an empty tree, or at least I haven't figured out how to make it do that.
I also used it when, after resolving a merge initiated by cg-merge, cogito (or at least the version I had installed at the time) wouldn't let me commit it because a new file I had pulled in contained non-ascii characters in its name.
skimo