user/sven/git.git/read-tree.c, branch v0.99.8eGit
https://git.stealer.net/cgit.cgi/user/sven/git.git/atom?h=v0.99.8e2005-10-02T17:42:46Zread-tree: --trivial2005-10-02T17:42:46ZLinus Torvaldstorvalds@osdl.org2005-09-29T15:16:12Zurn:sha1:23822a355de674f1d1321ad7e112f0fe40124aca
This adds an option --trivial to restrict 3-way 'read-tree -m -u'
to happen only if there is no file-level merging required.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
read-tree: remove --head option.2005-10-02T07:50:16ZJunio C Hamanojunkio@cox.net2005-10-02T07:50:16Zurn:sha1:7dd43575f8641c8a73b1e976715056ebdc773904
Initially it was to allow specifying more than one remote to
allow creation of an Octopus, but it is not being used.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Document -i flag to git-read-tree2005-09-20T22:07:52ZJunio C Hamanojunkio@cox.net2005-09-19T18:33:14Zurn:sha1:f318dd229f9df88470de8541916d48c9380e2e35
Somehow I missed it when we updated read-tree to support the recursive
merge strategy. Also -i should require -m as well, which the command
did not check.
Signed-off-by: Junio C Hamano <junkio@cox.net>
read-tree: fix bogus debugging statement.2005-09-14T05:27:42ZJunio C Hamanojunkio@cox.net2005-09-14T05:27:42Zurn:sha1:2ba6c47be1762726ad0c1d5779064c489150d789
We wanted to detect case #16 which should be rare, but botched the
case when some paths are missing, causing a segfault. My fault.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Add a new merge strategy by Fredrik Kuivinen.2005-09-11T02:46:53ZJunio C Hamanojunkio@cox.net2005-09-11T00:46:27Zurn:sha1:720d150c48fc35fca13c6dfb3c76d60e4ee83b87
I really wanted to try this out, instead of asking for an adjustment
to the 'git merge' driver and waiting. For now the new strategy is
called 'fredrik' and not in the list of default strategies to be tried.
The script wants Python 2.4 so this commit also adjusts Debian and RPM
build procecure files.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Plug leak in Daniel's read-tree.2005-09-11T01:27:42ZJunio C Hamanojunkio@cox.net2005-09-11T01:14:14Zurn:sha1:bb97a2a804e0afdd686ed9f18fed2ddc15833540
... and it is ready to be pushed out in the "master" branch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
[PATCH] Add debugging help for case #16 to read-tree.c2005-09-11T01:27:42ZJunio C Hamanojunkio@cox.net2005-09-06T19:53:56Zurn:sha1:4d3fe0c5f342d0b00209916cf6951c2f8db414d2
This will help us detect if real-world example merges have multiple
merge-base candidates and one of them matches one head while another
matches the other head.
Signed-off-by: Junio C Hamano <junkio@cox.net>
[PATCH] Disable debugging from read-tree.2005-09-11T01:27:42ZJunio C Hamanojunkio@cox.net2005-09-05T08:13:36Zurn:sha1:2ab706a38fbe6f4adb2fd09806a5d5faf33d355f
Signed-off-by: Junio C Hamano <junkio@cox.net>
[PATCH] Rewrite read-tree2005-09-11T01:27:41ZDaniel Barkalowbarkalow@iabervon.org2005-09-05T06:04:48Zurn:sha1:ee6566e8d70da682ac4926dd8a67ac821b2c1743
Adds support for multiple ancestors, removes --emu23, much simplification.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
[PATCH] Unify usage strings declaration2005-07-30T00:21:50ZPetr Baudispasky@suse.cz2005-07-29T09:01:26Zurn:sha1:4d1f11903393bd79998144ce1089ce427a49a2ed
All usage strings are now declared as static const char [].
This is carried over from my old git-pb branch.
Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>