On 12/11/05, Petr Baudis <pasky@suse.cz> wrote:This was the case with the first StGIT implementations but I slowly began to want to only use StGIT and not switch to something else for trivial SCM operations. I eventually added 'stg commit' which stores the patches permanently into the base of the stack to enable some kind of maintainer mode for StGIT. My main use for this was to import patches directly into the main branch and not keep a separate one and pull between them. The gitmergeonefile.py script in StGIT adds every conflict to the .git/conflicts file which is read by 'stg status'. My goal is not to leave any unmerged entried in the index even if there are conflicts. Maybe this could be changed and .git/conflicts file avoided entirely. Anyway, while I'll try not to add more SCM functionality to StGIT, I don't think I should remove the existing add/rm/status functionality. It's just handy not to use a different command when you want a new file added to a patch. -- Catalin - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
| David Miller | Slow DOWN, please!!! |
| Greg Kroah-Hartman | [PATCH 005/196] Chinese: add translation of SubmittingDrivers |
| Andrea Arcangeli | [PATCH 01 of 11] mmu-notifier-core |
| Andrew Morton | 2.6.23-rc3-mm1 |
git: | |
| Carl Worth | Difficulties in advertising a new branch to git newbies |
| Junio C Hamano | Re: [PATCH 3/3] Teach "git branch" about --new-workdir |
| Peter Stahlir | Git as a filesystem |
| Linus Torvalds | Re: irc usage.. |
| Wolfgang Walter | Re: Kernel oops with 2.6.26, padlock and ipsec: probably problem with fpu state ch... |
| Ingo Molnar | Re: iwlwifi: fix build bug in "iwlwifi: fix LED stall" |
| David Woodhouse | Re: [bug?] tg3: Failed to load firmware "tigon/tg3_tso.bin" |
| Cedric Le Goater | Re: [PATCH net-2.6.24 0/3]: More TCP fixes |
| Richard Stallman | Real men don't attack straw men |
| Jason Dixon | Wasting our Freedom |
| bofh | Re: Code signing in OpenBSD |
| no@spam@mgedv.net | Re: HUAWEI not recognized properly (3 modem) |
| high memory | 6 hours ago | Linux kernel |
| semaphore access speed | 9 hours ago | Applications and Utilities |
| the kernel how to power off the machine | 10 hours ago | Linux kernel |
| Easter Eggs in windows XP | 13 hours ago | Windows |
| Shared swap partition | 14 hours ago | Linux general |
| Root password | 14 hours ago | Linux general |
| Where/when DNOTIFY is used? | 16 hours ago | Linux kernel |
| How to convert Linux Kernel built-in module into a loadable module | 18 hours ago | Linux kernel |
| Linux 2.6.24 and I/O schedulers | 19 hours ago | Linux kernel |
| USB Driver -- Interrupt Polling -- A Little Help Please | 1 day ago | Linux general |
