You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

126 lines
4.4 KiB

To: git@vger.kernel.org
cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Johannes Sixt <j6t@kdbg.org>,
Paul Mackerras <paulus@samba.org>,
Robin Rosenberg <robin.rosenberg@dewire.com>,
"Boyd Stephen Smith Jr." <bss@iguanasuicide.net>
Subject: What's in git.git (Dec 2008, #03; Sun, 21)
X-maint-at: 718258e256b74622aa55f5ee0cb9cff4cce6bf9f
X-master-at: b3eae84dc10e452add0e79c7373ceee16f73f7f0
X-maint-was: 718258e256b74622aa55f5ee0cb9cff4cce6bf9f
X-master-was: 7e76aba317b690932c8236311219b0faf97f1571
What's in git.git (Dec 2008, #03; Sun, 21)
maint 718258e (GIT 1.6.0.6)
master b3eae84 (Documentation/git-show-branch: work around "single quote" typesetting glitch)
------------------------------------------------------------------------
The 'maint' branch is at 1.6.0.6, which hopefully will be the last
maintenance release until 1.6.1 final.
Earlier I said I'd like to have 1.6.1 final this weekend, but I'd rather
play safe and tag -rc4 tonight (gee, it is already 04:00am), and leave the
final 1.6.0 as Christmas present to git users.
* Paul has one patch on his gitk branch I have fetched but not merged yet;
waiting for his go-ahead.
* I am undecided whether I should include the "rebase -i -p" patch from
j6t in 1.6.1 and have been waiting for comments from Dscho.
* A documentation patch from Boyd Stephen Smith Jr. to add a reference to
the new HowTo page from git-revert manpage and an additional warning to
git-revert from Robin Rosenberg are still not in yet, but I would like
to have them with updates in 1.6.1 final.
Other than that, the 'master' I am pusing out is pretty much it for
1.6.1.
----------------------------------------------------------------
* The 'master' branch has these since the last announcement.
Alexander Gavrilov (3):
git-gui: Fix handling of relative paths in blame.
git-gui: Fix commit encoding handling.
Documentation: Describe git-gui Tools menu configuration options.
Arjen Laarhoven (1):
Enable threaded delta search on Mac OS X/Darwin
Christian Stimming (1):
git-gui: Update German (completed) translation.
Fredrik Skolmli (1):
git-gui: Starting translation for Norwegian
Johannes Schindelin (2):
Get rid of the last remnants of GIT_CONFIG_LOCAL
git-gui: Get rid of the last remnants of GIT_CONFIG_LOCAL
Junio C Hamano (6):
gitweb: do not run "git diff" that is Porcelain
make_absolute_path(): check bounds when seeing an overlong symlink
builtin-blame.c: use strbuf_readlink()
combine-diff.c: use strbuf_readlink()
Make sure lockfiles are unlocked when dying on SIGPIPE
send-email: futureproof split_addrs() sub
Kirill A. Korinskiy (1):
Remove the requirement opaquelocktoken uri scheme
Lee Marlow (2):
bash completion: Sort config completion variables
bash completion: Sync config variables with their man pages
Linus Torvalds (5):
Add generic 'strbuf_readlink()' helper function
Make 'ce_compare_link()' use the new 'strbuf_readlink()'
Make 'index_path()' use 'strbuf_readlink()'
Make 'diff_populate_filespec()' use the new 'strbuf_readlink()'
Make 'prepare_temp_file()' ignore st_size for symlinks
Marcel M. Cary (1):
git-sh-setup: Fix scripts whose PWD is a symlink into a git work-dir
Markus Heidelberg (5):
Documentation: fix description for enabling hooks
doc/git-reset: add reference to git-stash
Documentation: sync example output with git output
Documentation: fix typos, grammar, asciidoc syntax
Documentation/git-show-branch: work around "single quote" typesetting
glitch
Michael J Gruber (1):
test overlapping ignore patterns
Michele Ballabio (1):
git gui: update Italian translation
Miklos Vajna (3):
git-gui: Update Hungarian translation for 0.12
git-daemon documentation: use {tilde}
githooks documentation: add a note about the +x mode
Nanako Shiraishi (3):
git-gui: Update Japanese translation for 0.12
Clarify documentation of "git checkout <tree-ish> paths" syntax
Add a documentat on how to revert a faulty merge
Peter Krefting (2):
git-gui: Updated Swedish translation (515t0f0u).
git-gui: Fixed typos in Swedish translation.
René Scharfe (3):
Fix type-mismatch compiler warning from diff_populate_filespec()
connect.c: stricter port validation, silence compiler warning
fast-import.c: stricter strtoul check, silence compiler warning
Shawn O. Pearce (2):
git-gui: Update po template to include 'Mirroring %s' message
git-gui 0.12
YONETANI Tomokazu (1):
git-fast-import possible memory corruption problem