user/sven/git.git, branch v1.0rc6Git
https://git.stealer.net/cgit.cgi/user/sven/git.git/atom?h=v1.0rc62005-12-15T01:30:03ZGIT 0.99.9n aka 1.0rc62005-12-15T01:30:03ZJunio C Hamanojunkio@cox.net2005-12-15T01:30:03Zurn:sha1:1ed91937e5cd59fdbdfa5f15f6fac132d2b21ce0
Oh, I hate to do this but I ended up merging big usage string
cleanups from Fredrik, git-am enhancements that made a lot of
sense for non mbox users from HPA, and rebase changes (done
independently by me and Lukas) among other things, so git is
still in perpetual state of 1.0rc. 1.0 will probably be next
Wednesday, but who knows.
Signed-off-by: Junio C Hamano <junkio@cox.net>
git rebase loses author name/email if given bad email address2005-12-15T01:04:47ZAmos Waterlandapw@us.ibm.com2005-12-14T22:48:19Zurn:sha1:294c695d8cfbcf95a5c33fc6ba386f496964defb
If GIT_AUTHOR_EMAIL is of a certain form, `git rebase master' will blow
away the author name and email when fast-forward merging commits. I
have not tracked it down, but here is a testcase that demonstrates the
behavior.
Signed-off-by: Amos Waterland <apw@us.ibm.com>
Acked-by: Michal Ostrowski <mostrows@watson.ibm.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Bugfixes for git-rebase2005-12-15T01:02:03ZLukas Sandströmlukass@etek.chalmers.se2005-12-14T23:36:35Zurn:sha1:32d9954478734da4062cf2ffc2faf2d057e47fb6
Fix bugs in git-rebase wrt rebasing another branch than
the current HEAD, rebasing with a dirty working dir,
and rebasing a proper decendant of the target branch.
[jc: with a bit of hand-merging]
Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
mailinfo and git-am: allow "John Doe <johndoe>"2005-12-15T00:31:06ZJunio C Hamanojunkio@cox.net2005-12-15T00:31:06Zurn:sha1:e0e3ba208d235ab5623a86204fbd20b449520764
An isolated developer could have a local-only e-mail, which will
be stripped out by mailinfo because it lacks '@'. Define a
fallback parser to accomodate that.
At the same time, reject authorless patch in git-am.
Signed-off-by: Junio C Hamano <junkio@cox.net>
define MAXPATHLEN for hosts that don't support it2005-12-14T22:26:44ZMartin Atukundamatlads@dsmagic.com2005-12-13T12:21:34Zurn:sha1:252fef7149204d52ed4b46fd7e8ac8c803ceb0aa
[jc: Martin says syllable (www.syllable.org) wants this.]
Signed-off-by: Junio C Hamano <junkio@cox.net>
Do not let errors pass by unnoticed when running `make check'.2005-12-14T21:32:52ZJunio C Hamanojunkio@cox.net2005-12-14T21:32:52Zurn:sha1:773b6339435ab3bddecb9b78e49720e22124b52a
[jc: originally from Amos Waterland.]
Signed-off-by: Junio C Hamano <junkio@cox.net>
Merge branch 'hold/am'2005-12-14T21:04:43ZJunio C Hamanojunkio@cox.net2005-12-14T21:04:43Zurn:sha1:9a26dbd120110ad4e07d3047abc13d615183c8ecrebase: do not get confused in fast-forward situation.2005-12-14T21:04:25ZJunio C Hamanojunkio@cox.net2005-12-14T11:11:37Zurn:sha1:2db8aaeca1dca4e940829b87d1164e5b42ff49b4
When switching to another branch and rebasing it in a one-go, it
failed to update the variable that holds the branch head, and
did not detect fast-forward situation correctly.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Merge branch 'fk/usage'2005-12-14T21:01:01ZJunio C Hamanojunkio@cox.net2005-12-14T21:01:01Zurn:sha1:b0d3e9baaa16c805ef941e8f26d55fb23f091ef5Documentation: topic branches2005-12-14T20:57:49ZJunio C Hamanojunkio@cox.net2005-12-14T20:57:49Zurn:sha1:a4adf54d38ba49e58511aaafd18e99e6d3d4dabb
Recommend git over ssh direct to master.kernel.org, instead of
going over rsync to public machines, since this is meant to be a
procedure for kernel subsystem maintainers.
Also fix an obvious typo.
Signed-off-by: Junio C Hamano <junkio@cox.net>