user/sven/git.git, branch v0.99.9cGit
https://git.stealer.net/cgit.cgi/user/sven/git.git/atom?h=v0.99.9c2005-11-03T23:45:36ZGIT 0.99.9c2005-11-03T23:45:36ZJunio C Hamanojunkio@cox.net2005-11-03T23:45:36Zurn:sha1:6ddc0964034342519a87fe013781abf31c6db6ad
Signed-off-by: Junio C Hamano <junkio@cox.net>
Illustration: "Commit DAG Revision Naming"2005-11-03T22:55:49ZJunio C Hamanojunkio@cox.net2005-11-03T21:52:44Zurn:sha1:2be8fd085e865097fa0908fe1a94c8edf9cde7f5
Jon Loeliger's ASCII art in the git-rev-parse(1) manual.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Illustration: "Git Diff Types"2005-11-03T22:55:48ZJunio C Hamanojunkio@cox.net2005-11-03T21:52:44Zurn:sha1:36f05ef485d023eda3bf750e7b207d07d5feb39d
Jon Loeliger's ASCII art in the Tutorial.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Illustration: "Fundamental Git Index Operations"2005-11-03T22:55:48ZJunio C Hamanojunkio@cox.net2005-11-03T21:52:44Zurn:sha1:66158e331b385a81ac825c208c6160a0cdd2324c
Jon Loeliger's ASCII art in the Discussion section.
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge-ours: make sure our index matches HEAD2005-11-03T22:55:11ZJunio C Hamanojunkio@cox.net2005-11-03T09:51:25Zurn:sha1:160252f81626d865b9e902abffe5e4976944c930
git-merge expects this check to be done appropriately by the
merge strategy backends. In the case of merge-ours strategy,
the resulting tree comes what we have in the index file, so it
must match the current HEAD; otherwise it would not be "ours"
merge.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Add 'ours' merge strategy.2005-11-03T22:55:10ZJunio C Hamanojunkio@cox.net2005-11-02T03:34:49Zurn:sha1:64da9e604eea25c9c20cfe12618285ccd0bf3cfe
This adds the coolest merge strategy ever, "ours". It can take
arbitrary number of foreign heads and merge them into the
current branch, with the resulting tree always taken from our
branch head, hence its name.
What this means is that you can declare that the current branch
supersedes the development histories of other branches using
this merge strategy.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Add --no-commit to git-merge/git-pull.2005-11-03T22:55:10ZJunio C Hamanojunkio@cox.net2005-11-02T03:30:11Zurn:sha1:123ee3ca7b57c32bb3ecd8cfede20dbb9dd5a8a8
With --no-commit flag, git-pull will perform the merge but pretends as
if the merge needed a hand resolve even if automerge cleanly resolves,
to give the user a chance to add further changes and edit the commit
message.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Document --since and --until options to rev-parse.2005-11-03T07:41:25ZJunio C Hamanojunkio@cox.net2005-11-03T07:41:25Zurn:sha1:a3114b3428595710d4719dd668531210af5993c9
The usability magic were hidden in the source code without being
documented, and even the maintainer did not know about them ;-).
Signed-off-by: Junio C Hamano <junkio@cox.net>
Be careful when dereferencing tags.2005-11-03T00:50:58ZJunio C Hamanojunkio@cox.net2005-11-02T23:19:13Zurn:sha1:9534f40bc42dd826cc26c8c8c84f6a8a5fc569f6
One caller of deref_tag() was not careful enough to make sure
what deref_tag() returned was not NULL (i.e. we found a tag
object that points at an object we do not have). Fix it, and
warn about refs that point at such an incomplete tag where
needed.
Signed-off-by: Junio C Hamano <junkio@cox.net>
[PATCH] Clean up the SunOS Makefile rule2005-11-03T00:50:58ZPeter Eriksens022018@student.dtu.dk2005-11-02T19:27:31Zurn:sha1:2fd955cc0b49de9e64b2f073ce76033975f0be24
Don't set a non-standard CURLDIR as default, and fix an error
in Solaris 10 by setting NEEDS_LIBICONV.
Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>