git, branch v0.99.9gFork of git SCM with my patches.http://git.kilabit.info/git/atom?h=v0.99.9g2005-11-10T05:09:43ZGIT 0.99.9g2005-11-10T05:09:43ZJunio C Hamanojunkio@cox.net2005-11-10T05:09:43Zurn:sha1:23ea3e201cea0deea909569e08e950a9ec2345f7
Another snapshot, as slow and steady marth towards 1.0 continues.
Major changes include:
- Jim Radford's RPM split.
- Fredrik's recursive merge strategy is now default for two heads merge.
- Yaacov's SVN importer updates.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Make git-recursive the default strategy for git-pull.2005-11-10T02:56:29ZJunio C Hamanojunkio@cox.net2005-11-08T10:00:31Zurn:sha1:a1c292958f9968565f4048a17196d99fd16fc7ca
This does two things:
- It changes the hardcoded default merge strategy for two-head
git-pull from resolve to recursive.
- .git/config file acquires two configuration items.
pull.twohead names the strategy for two-head case, and
pull.octopus names the strategy for octopus merge.
IOW you are paranoid, you can have the following lines in your
.git/config file and keep using git-merge-resolve when pulling
one remote:
[pull]
twohead = resolve
OTOH, you can say this:
[pull]
twohead = resolve
twohead = recursive
to try quicker resolve first, and when it fails, fall back to
recursive.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Use 'merge-base --all' where applicable.2005-11-10T02:54:14ZJunio C Hamanojunkio@cox.net2005-11-10T02:54:14Zurn:sha1:13956670a7baf4b3b794a2cc799bd501753f1746
It may get extra merge base on truly pathological commit histories,
but is a lot easier to understand, explain, and prove correctness.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Merge branch 'hold/svn'2005-11-10T02:44:42ZJunio C Hamanojunkio@cox.net2005-11-10T02:44:42Zurn:sha1:a489352e3d1d861237729385f9afc5950bcfa6a0Merge branch 'hold/rpm'2005-11-10T02:44:18ZJunio C Hamanojunkio@cox.net2005-11-10T02:44:18Zurn:sha1:68afd5fab777a3c27e205d33c2379d8af6c7749fgit-apply: do not fail on binary diff when not applying nor checking.2005-11-09T23:19:50ZJunio C Hamanojunkio@cox.net2005-11-09T22:59:23Zurn:sha1:ff36de0847768873cc793afd6378d3b229591436
We run git-apply with --stat and --summary at the end of the pull
by default, which causes it to barf when the pull brought in changes
to binary files. Just mark them as binary patch and proceed when
not applying nor checking.
[jc: I almost missed --check until I saw Linus did something similar.]
Signed-off-by: Junio C Hamano <junkio@cox.net>
Update INSTALL2005-11-09T20:40:03ZJunio C Hamanojunkio@cox.net2005-11-09T20:40:03Zurn:sha1:c44922a7817398d63bb2b46dc599bd05c710e746
Explicitly mention how to install by hand in build-as-user and
install-as-root steps.
Signed-off-by: Junio C Hamano <junkio@cox.net>
merge-recursive: Fix support for branch names containing slashes2005-11-09T20:32:36ZFredrik Kuivinenfreku045@student.liu.se2005-11-09T10:42:57Zurn:sha1:186f855fc639f2063e5f02abc75ca39464a35500
A branch name could have a slash in it.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
merge-recursive: Fix limited output of rename messages2005-11-09T20:32:34ZFredrik Kuivinenfreku045@student.liu.se2005-11-09T10:36:55Zurn:sha1:c8a4f5e5422677b950e7e74b29fa6631fd8ce243
The previous code did the right thing, but it did it by accident.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Fix cvsexportcommit syntax error2005-11-09T07:34:29ZAlexander Litvinovlan@ac-sw.com2005-11-09T07:02:58Zurn:sha1:e09f5d7b07ada67f9e9c25ba7e58d76b8d5f4253
There is a syntax error in cvsexport script:
Signed-off-by: Junio C Hamano <junkio@cox.net>