* The 'maint' branch has produced the third maintenance release
1.4.2.3 a few days ago.
* The 'master' branch is at 1.4.3-rc1; we are in stabilization
cycle. I do not think I have made any formal announcement on
the merge policy during -rc; I am planning to play by the
following rules:
* no new features nor interface change should hit "master"
after -rc1, but I am a human and smaller things could seep
through ;-).
* fixes for "master" are encouraged and very much appreciated;
* fixes for "next" are also encouraged and appreciated, but
perfecting a topic that was still in "next" after -rc1 will
not make the topic for a candidate in the upcoming "master"
release. It will make the topic merged as part of the first
wave of merges after the release.
* For totally new topics, I reserve the right to drop them on
the floor during the stabilization period, but they might
get lucky and land on "next" or "pu" depending on my mood.
Please re-send them after the next release if you care
deeply enough.
contrib/ is exempt from the above rules for obvious reasons.
Here are what was added since 1.4.3-rc1 and will be in 1.4.3.
By the above definition, they should mostly be fixes:
Alan Chandler:
Update the gitweb/README file to include setting the GITWEB_CONFIG environment
git.c: Fix usage string to match that given in the man page
Alexandre Julliard:
git.el: Fixed inverted "renamed from/to" message.
vc-git.el: Switch to using git-blame instead of git-annotate.
Dennis Stosberg:
lock_ref_sha1_basic does not remove empty directories on BSD
Franck Bui-Huu:
Add git-upload-archive to the main git man page
Junio C Hamano:
Makefile: install and clean merge-recur, still.
git-mv: invalidate the removed path properly in cache-tree
git-push: .git/remotes/ file does not require SP after colon
escape tilde in Documentation/git-rev-parse.txt
tar-tree deprecation: we eat our own dog food.
gitweb: Make the Git logo link target to point to the homepage
git-send-email: avoid uninitialized variable warning.
cherry-pick: make -r the default
Luben Tuikov:
gitweb: Escape ESCAPE (\e) character
gitweb: Do not print "log" and "shortlog" redundantly in commit view
gitweb: blame: Minimize vertical table row padding
Martin Waitz:
gitweb: document webserver configuration for common gitweb/repo URLs.
git-commit: cleanup unused function.
Robin Rosenberg:
Error in test description of t1200-tutorial
* The 'next' branch, in addition, has these. They will not be
in 1.4.3 (except one):
- git-pack-refs, git-for-each-ref, git-show-ref by Linus and
me, with help in updating the documentation, test scripts,
and updates to the tools to use them from Andy Whitcroft,
Christian Couder, Dennis Stosberg, Jeff King, Johannes,
Jonas, Pasky,
I think this is in testable shape and I started to use
packed refs in one of my test repositories to see what are
still broken. Hopefully be in "master" soon after 1.4.3.
- git-receive-pack uses the common ref-locking code, and as a
side effect git-push will add ref-log entries on the remote
end if enabled.
This depends on the first item and should be considered a
part of it.
- git log --summary without any other options now look into
subdirectories, thanks to Johannes.
This is a small backward-incompatible change, but I think it
falls into "fix a broken behaviour" category (same as making
"cherry-pick -r" the default). If nobody objects I'll merge
it to "master" before 1.4.3-rc2.
- "git log --all-match --author=Foo --committer=Bar".
- "git apply" is prepared for planned output format change for
"git diff" when a file with SP in its name is involved. We
will add a trailing TAB on "+++/---" lines.
Merge to "master" immediately after 1.4.3
- Santi Béjar tidied up output from fetch and merge.
Merge to "master" immediately after 1.4.3
- Robert Shearman taught git-rebase (sans --merge) to use
--ignore-if-in-upstream to reduce obvious conflicts, and
taught it to show upstream changes with -v option.
Merge to "master" immediately after 1.4.3
- Assorted gitweb updates by Alan Chandler, me, Luben Tuikov,
Martin Waitz
Notable enhancements are:
- blame page output got a facelift.
- the URL gitweb generates can use PATH_INFO.
Merge to "master" sometime after 1.4.3
- Nico's pack format optimization.
I've been using this for my pulls and haven't seen a
problem. I'll enable it for repository packing in one of my
test repository soon to see if I get burned ;-) but I do not
expect breakage from Nico's code. Soon after dust settles
from other ones graduating to "master" post 1.4.3.
- "git blame --show-name" tells it to always output filename.
After dust settles from other ones graduating to "master"
post 1.4.3.
* The 'pu' branch, in addition, has these.
- "git diff"'s output format change for a file with SP in its
name, as described above. This will be merged after the
matching change to "git apply" graduates to "master" and
matures.
- "git blame --porcelain" gives richer information on revs
that are involved for scripted use.
- "gitweb" is updated to use the above "git blame --porcelain"
- My WIP of parallel tree walker hasn't made any progress.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html