Git

General
Development
Edit

News

[201 total ]
[ANNOUNCE] Stacked GIT 0.14

Posted about 1 year ago by Catalin Marinas

Stacked GIT 0.14 release is available from http://www.procode.org/stgit/.

StGIT is a Python application providing similar functionality to Quilt
(i.e. pushing/popping patches to/from a stack) on top of GIT. These
operations are ... [More] performed using GIT commands and the patches are stored
as GIT commit objects, allowing easy merging of the StGIT patches into
other repositories using standard GIT functionality.

This release requires at least Python 2.4 and GIT 1.5.2.

The main features in this release:

* Support for correctly running StGIT in subdirectories
* 'repair' command for fixing an StGIT repository modified by GIT
commands such as 'commit', 'pull', 'merge' or 'rebase'
* 'edit' command for editing both the patch description and diff
* Support for SMTP over TLS
* Support for MIME multipart e-mail templates
* '--attach' option to the 'mail' command to send a patch attached
rather than inline
* Diff statistics and shortlog added to the cover e-mail template
* '--sign/ack' options to the 'import' and 'new' commands
* '--number' to the 'log' command for limiting the output
* Support for binary files in patches
* Support for detached HEAD
* Refactoring of some modules with better support for debugging
* Many bug-fixes

Acknowledgements (many thanks to all the people who contributed code,
reported bugs or made suggestions):

Karl Hasselstr [Less]

[ANNOUNCE] git-gui 0.9.0

Posted over 2 years ago by Shawn O. Pearce

git-gui 0.9.0 is now available on repo.or.cz:

gitweb: http://repo.or.cz/w/git-gui.git
git: git://repo.or.cz/git-gui.git
http://repo.or.cz/r/git-gui.git

This is the first release that includes i18n ... [More] support. I'm kicking
it out as something between a pre-release and a full release.

The English version has been quite stable and is in heavy production
use by a lot of users so I figure its time to tag it. Some of the
non-English translations may need to be updated, but many of them
are reasonably current. I'm inclined to do a 0.9.1 in the near
future if updated translations come in.

Many thanks to all those who have contributed to this release.

-----

Major notable improvements over the 0.8 series:

* More native appearance on Mac OS X

git-gui now displays "Git Gui" as its application name in the
menu bar, instead of "Wish". It also uses Henrik Nyh's Git
logo in the dock and error dialogs.

* Window/shortcut icon on Microsoft Windows

The icon in the upper left corner of each window's title bar
(and on the taskbar) is now Henrik Nyh's Git logo instead of
the Tcl feather.

On Windows git-gui now creates true Windows shortcuts to launch
git-gui in a specific repository. This allows the icon to be a
git specific icon instead of the generic Windows batch file icon.

* Repository creation/clone UI

Starting git-gui outside of a repository allows the user to
create a new repository, clone an existing repository or open a
previously accessed repository. The clone process actually uses
a pure Tcl implementation of git-clone, based on `git init &&
git remote add origin ... && git fetch`.

This makes it easier to create a shortcut to launch git-gui
from desktop menu systems, e.g. the Windows Start menu or
the Mac OS X dock.

* i18n translations for de, hu, it, ja, ru, zh_cn

Some of these are still under development. Hopefully we can
get even more translations in 0.9.1.

-----

Changes since 0.8.4:

Alex Riesen (2):
More updates and corrections to the russian translation of git-gui
Updated russian translation of git-gui

Christian Stimming (12):
Mark strings for translation.
Makefile rules for translation catalog generation and installation.
Add glossary that can be converted into a po file for each language.
Add glossary translation template into git.
German translation for git-gui
German glossary for translation
git-gui: Add more words to translation glossary
git-gui: Update German glossary according to mailing list discussion
git-gui: Incorporate glossary changes into existing German translation
git-gui: Update German translation, including latest glossary changes
git-gui: Add more terms to glossary.
git-gui: Update German translation

Harri Ilari Tapio Liusvaara (1):
git-gui: Disambiguate "commit"

Irina Riesen (1):
git-gui: initial version of russian translation

Johannes Schindelin (7):
Add po/git-gui.pot
Ignore po/*.msg
git-gui: Deiconify startup wizard so it raises to the top
git-gui: add a simple msgfmt replacement
po2msg: ignore entries marked with "fuzzy"
po2msg: ignore untranslated messages
po2msg: actually output statistics

Johannes Sixt (1):
git-gui: Change main window layout to support wider screens

Junio C Hamano (2):
git-gui po/README: Guide to translators
git-gui: Update Japanese strings (part 2)

Kirill (1):
Updated Russian translation.

Michele Ballabio (4):
git-gui: remove dots in some UI strings
git-gui: add some strings to translation
git-gui: fix typo in lib/blame.tcl
git-gui: update Italian translation

Miklos Vajna (1):
Hungarian translation of git-gui

Paolo Ciarrocchi (1):
Italian translation of git-gui

Shawn O. Pearce (55):
git-gui: Locate the library directory early during startup
git-gui: Initialize Tcl's msgcat library for internationalization
git-gui: Update po/README as symlink process is not necessary
git-gui: Correct stock message for 'Invalid font specified in %s'
git-gui: Quiet the msgfmt part of the make process
git-gui: Ensure msgfmt failure stops GNU make
git-gui: Mark revision chooser tooltip for translation
git-gui: Localize commit/author dates when displaying them
git-gui: Support context-sensitive i18n
git-gui: Document the new i18n context support
git-gui: Make the tree browser also use lightgray selection
git-gui: Paper bag fix missing translated strings
git-gui: Fix missing i18n markup in push/fetch windows
git-gui: Support native Win32 Tcl/Tk under Cygwin
git-gui: Refactor some UI init to occur earlier
git-gui: Allow users to choose/create/clone a repository
git-gui: Avoid console scrollbars unless they are necessary
git-gui: Don't bother showing OS error message about hardlinks
git-gui: Keep the UI responsive while counting objects in clone
git-gui: Copy objects/info/alternates during standard clone
git-gui: Don't delete console window namespaces too early
git-gui: Don't delete scrollbars in console windows
git-gui: Switch the git-gui logo to Henrik Nyh's logo
git-gui: Make the status bar easier to read in the setup wizard
git-gui: Use Henrik Nyh's git logo icon on Windows systems
git-gui: Support a native Mac OS X application bundle
git-gui: Refer to ourselves as "Git Gui" and not "git-gui"
git-gui: Allow forced push into remote repository
git-gui: Refactor Henrik Nyh's logo into its own procedure
git-gui: Refactor about dialog code into its own module
git-gui: Include our Git logo in the about dialog
git-gui: Use progress meter in the status bar during index updates
git-gui: Consolidate the Fetch and Push menus into a Remote menu
git-gui: Bind Cmd-, to Preferences on Mac OS X
git-gui: Shorten the staged/unstaged changes title bar text
git-gui: Updated po strings based on current sources
git-gui: Move load_config procedure below git-version selection
git-gui: Refactor git-config --list parsing
git-gui: Support LFs embedded in config file values
git-gui: Change repository browser radio buttons to hyperlinks
git-gui: Offer repository management features in menu bar
git-gui: Fix bind errors when switching repository chooser panels
git-gui: Disable the text widget in the repository chooser
git-gui: Bind n/c/o accelerators in repository chooser
git-gui: Ensure copyright message is correctly read as UTF-8
git-gui: Use proper Windows shortcuts instead of bat files
git-gui: Support cloning Cygwin based work-dirs
git-gui: Collapse $env(HOME) to ~/ in recent repositories on Windows
git-gui: Honor a config.mak in git-gui's top level
git-gui: Paper bag fix the global config parsing
git-gui: Make sure we get errors from git-update-index
git-gui: Protect against bad translation strings
git-gui: Allow users to set font weights to bold
git-gui: Bind Meta-T for "Stage To Commit" menu action
git-gui 0.9.0

Steffen Prohaska (4):
git-gui: add directory git-gui is located in to PATH (on Windows)
git-gui: set NO_MSGFMT to force using pure tcl replacement in msysgit
git-gui: add mingw specific startup wrapper
git-gui: offer a list of recent repositories on startup

Xudong Guan (2):
Initial Chinese translation for git-gui
git-gui: Added initial version of po/glossary/zh_cn.po

しらいしななこ (2):
Japanese translation of git-gui
git-gui: Update Japanese strings

--
Shawn.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

[ANNOUNCE] Guilt v0.28

Posted over 2 years ago by Josef Sipek

Guilt v0.28 is available for download (once it mirrors out on kernel.org).

Guilt (Git Quilt) is a series of bash scripts which add a Mercurial
queues-like functionality and interface to git.

(kernel.org seems to be slow at ... [More] mirroring things today, so please be
patient)

Tarballs:
http://www.kernel.org/pub/linux/kernel/people/jsipek/guilt/

Git repo:
git://git.kernel.org/pub/scm/linux/kernel/git/jsipek/guilt.git

This release took _far_ too long to make. The major changes since v0.27
include:

- fix for insecure handling of temporary files (CVE-2007-5207)
- push and pop now support -n to push/pop specified number of patches
- import-commit can import any commit from any branch
- couple of other small bugfixes/tweaks

For more details about any of the commits, check the commits.

As always, patches, and other feedback is welcome.

Josef "Jeff" Sipek.

------------
Changes since v0.27:

David Chinner (1):
{push,pop}: Add -n option

Erez Zadok (1):
Documentation fixups

Eric Lesh (2):
guilt-help: Make guilt-cmd --help show the right man page
[GUILT PATCH] guilt-import-commit: Import commits from any branch

Josef 'Jeff' Sipek (6):
{next,prev,top}: Update usage strings & docs
guilt: Fix insecure handling of temporary files
patchbomb: Be quiet when there are no Cc lines in patch header
guilt: fixed bad interaction between push_patch() and git
guilt: Fixed regexp matching the beginning of the patch
Guilt v0.28

Peter Zijlstra (1):
guilt: allow for full path in {top,next,prev}
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

[ANNOUNCE] GIT 1.5.3.6

Posted over 2 years ago by Junio C Hamano

The latest maintenance release GIT 1.5.3.6 is available at the
usual places:

http://www.kernel.org/pub/software/scm/git/

git-1.5.3.6.tar.{gz,bz2} (tarball)
git-htmldocs-1.5.3.6.tar.{gz,bz2} (preformatted docs)
... [More] git-manpages-1.5.3.6.tar.{gz,bz2} (preformatted docs)
RPMS/$arch/git-*-1.5.3.6-1.$arch.rpm (RPM)

----------------------------------------------------------------
GIT v1.5.3.6 Release Notes
==========================

Fixes since v1.5.3.5
--------------------

* git-cvsexportcommit handles root commits better.

* git-svn dcommit used to clobber when sending a series of
patches.

* git-svn dcommit failed after attempting to rebase when
started with a dirty index; now it stops upfront.

* git-grep sometimes refused to work when your index was
unmerged.

* "git-grep -A1 -B2" acted as if it was told to run "git -A1 -B21".

* git-hash-object did not honor configuration variables, such as
core.compression.

* git-index-pack choked on a huge pack on 32-bit machines, even when
large file offsets are supported.

* atom feeds from git-web said "10" for the month of November.

* a memory leak in commit walker was plugged.

* When git-send-email inserted the original author's From:
address in body, it did not mark the message with
Content-type: as needed.

* git-revert and git-cherry-pick incorrectly refused to start
when the work tree was dirty.

* git-clean did not honor core.excludesfile configuration.

* git-add mishandled ".gitignore" files when applying them to
subdirectories.

* While importing a too branchy history, git-fastimport did not
honor delta depth limit properly.

* Support for zlib implementations that lack ZLIB_VERNUM and definition
of deflateBound() has been added.

* Quite a lot of documentation clarifications.

----------------------------------------------------------------

Changes since v1.5.3.5 are as follows:

Alex Riesen (1):
stop t1400 hiding errors in tests

Ask Bjørn Hansen (1):
When exec() fails include the failing command in the error message

Benoit Sigoure (2):
git-send-email: Change the prompt for the subject of the initial message.
git-svn: prevent dcommitting if the index is dirty.

Brad King (1):
cvsexportcommit: fix for commits that do not have parents

Christian Couder (1):
for-each-ref: fix off by one read.

David D Kilzer (2):
RelNotes-1.5.3.5: fix typo
RelNotes-1.5.3.5: fix another typo

David Symonds (1):
Improve accuracy of check for presence of deflateBound.

Eric Wong (2):
git-svn: fix dcommit clobbering when committing a series of diffs
git-svn: t9114: verify merge commit message in test

Gerrit Pape (4):
git-diff.txt: add section "output format" describing the diff formats
git-cvsimport: really convert underscores in branch names to dots with -u
git-daemon: fix remote port number in log entry
git-mailsplit: with maildirs not only process cur/, but also new/

Jakub Narebski (1):
gitweb: Update config file example for snapshot feature in gitweb/INSTALL

Jeff King (2):
git-branch: remove mention of non-existent '-b' option
git-send-email: add charset header if we add encoded 'From'

Jing Xue (1):
replace reference to git-rm with git-reset in git-commit doc

Johannes Schindelin (1):
Add Documentation/CodingGuidelines

Jonas Fonseca (3):
Remove escaping of '|' in manpage option sections
instaweb: Minor cleanups and fixes for potential problems
Documentation: Fix man page breakage with DocBook XSL v1.72

Jonathan del Strother (1):
Fixing path quoting in git-rebase

Junio C Hamano (12):
grep with unmerged index
refresh_index_quietly(): express "optional" nature of index writing better
Makefile: add missing dependency on wt-status.h
Start preparing for 1.5.3.6
t/t3404: fix test for a bogus todo file.
revert/cherry-pick: allow starting from dirty work tree.
git-clean: honor core.excludesfile
core.excludesfile clean-up
Fix per-directory exclude handing for "git add"
Update draft release notes for 1.5.3.6
grep -An -Bm: fix invocation of external grep command
GIT 1.5.3.6

Kristian Høgsberg (1):
Remove unecessary hard-coding of EDITOR=':' VISUAL=':' in some test suites.

Marco Costalba (1):
Remove a couple of duplicated include

Mike Hommey (1):
Delay pager setup in git blame

Nicolas Pitre (3):
print warning/error/fatal messages in one shot
git-hash-object should honor config variables
fix index-pack with packs >4GB containing deltas on 32-bit machines

Ralf Wildenhues (3):
git-clone.txt: Improve --depth description.
Avoid a few unportable, needlessly nested "...`...".
Fix sed string regex escaping in module_name.

Sergei Organov (6):
git-filter-branch.txt: fix a typo.
git-format-patch.txt: fix explanation of an example.
Documentation: quote commit messages consistently.
SubmittingPatches: improve the 'Patch:' section of the checklist
core-tutorial.txt: Fix argument mistake in an example.
git-remote.txt: fix typo

Shawn O. Pearce (2):
Fix memory leak in traverse_commit_list
Don't allow fast-import tree delta chains to exceed maximum depth

Vincent Zanotti (1):
gitweb: correct month in date display for atom feeds

Wincent Colaiuta (2):
Grammar fixes for gitattributes documentation
Fix t9101 test failure caused by Subversion "auto-props"

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

[ANNOUNCE] cgit v0.7

Posted over 2 years ago by Lars Hjemli

cgit v0.7 (a fast webinterface for git) is now available at

git://hjemli.net/pub/git/cgit

This release includes better search capabilities, better diff,
filtered and sorted branch/tag lists on the summary page, a simple ... [More] way
to switch between branches and finally a much needed restructuring of
the user interface. There is even a brand new logo, and a number of
bugfixes.

The latest version can be seen in action on http://hjemli.net/git/
(disclaimer: I'm not a web/user interface designer, and should not be
held responsible for any eyeball-related damages).

Big thanks to everyone who submitted patches and feedback!

---
Sortlog since v0.6

Chris Pickel (3):
Makefile: add support for DESTDIR
Make cgit honor CACHE_ROOT as defined in Makefile
Improve the sample cgitrc file

Lars Hjemli (47):
Makefile: add missing references to DESTDIR
cgit v0.6.1
Revert "Makefile: add missing references to DESTDIR"
Revert part of "Makefile: add support for DESTDIR"
cgit v0.6.2
ui-tree: specify parameter position for all htmlf formats
ui-tree: show last line of blob
Add cgit.conf to .gitignore, remove *~
Remove a few compiler warnings
Use trim_end() to remove trailing slashes
Upgrade to GIT 1.5.3.2
cgit v0.6.3
Add support for a renamelimit option in cgitrc
Add prefix parameter to cgit_diff_tree()
Add prefix parameter to cgit_print_diff()
ui-commit.c: link to diff instead of tree from diffstat
css: remove the annoying tr:hover rule for diffstat
gen-version.sh: don't sed the output from git describe
ui-diff: add links to pre- and postversion of blobs
cgit.css: make diff headers more visible
Use git-1.5.3.3
Skip unknown header fields when parsing tags and commits
Add functions and types for ref lists
Use reflist to print branch info
Use reflist to print tag info
Sort tags by age
Add support for config param summary-tags
Move logic for age comparision from cmp_tag_age into cmp_age()
Add support for config param summary-branches
Add descriptions of summary-branches and summary-tags to cgitrc
Make cgit_print_branches()/cgit_print_tags() external
Add support for refs view
Add links to the new refs page from summary page
Cleanup code introduced by the filter-refs topic
cgit_parse_commit(): Add missing call to xstrdup()
Add html_option() function
Teach log search about --grep, --author and --committer
Make print_branch() handle refs not pointing at commits
Teach cgit_object_link() about tag objects
Add config param 'index-info'
Change the cgit layout
Add search parameters to cgit_log_link
Fix search form action/hidden fields
Don't include current path in menu links
Don't include current SHA1 in 'log' menu-item
Use GIT-1.5.3.5
CGIT 0.7

Michael Krelin (2):
fixed typo in cgitrc
correct typo in CSS

Shunichi Fuji (1):
Fix typo in css
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

[ANNOUNCE] GIT 1.5.3.5

Posted over 2 years ago by Junio C Hamano

The latest maintenance release GIT 1.5.3.5 is available at the
usual places:

http://www.kernel.org/pub/software/scm/git/

git-1.5.3.5.tar.{gz,bz2} (tarball)
git-htmldocs-1.5.3.5.tar.{gz,bz2} (preformatted docs)
... [More] git-manpages-1.5.3.5.tar.{gz,bz2} (preformatted docs)
RPMS/$arch/git-*-1.5.3.5-1.$arch.rpm (RPM)

There are many fixes including a handful bugs that led to
segfaults.

----------------------------------------------------------------
GIT v1.5.3.5 Release Notes
==========================

Fixes since v1.5.3.4
--------------------

* Comes with git-gui 0.8.4.

* "git-config" silently ignored options after --list; now it will
error out with a usage message.

* "git-config --file" failed if the argument used a relative path
as it changed directories before opening the file.

* "git-config --file" now displays a proper error message if it
cannot read the file specified on the command line.

* "git-config", "git-diff", "git-apply" failed if run from a
subdirectory with relative GIT_DIR and GIT_WORK_TREE set.

* "git-blame" crashed if run during a merge conflict.

* "git-add -i" did not handle single line hunks correctly.

* "git-rebase -i" and "git-stash apply" failed if external diff
drivers were used for one or more files in a commit. They now
avoid calling the external diff drivers.

* "git-log --follow" did not work unless diff generation (e.g. -p)
was also requested.

* "git-log --follow -B" did not work at all. Fixed.

* "git-log -M -B" did not correctly handle cases of very large files
being renamed and replaced by very small files in the same commit.

* "git-log" printed extra newlines between commits when a diff
was generated internally (e.g. -S or --follow) but not displayed.

* "git-push" error message is more helpful when pushing to a
repository with no matching refs and none specified.

* "git-push" now respects (force push) on wildcard refspecs,
matching the behavior of git-fetch.

* "git-filter-branch" now updates the working directory when it
has finished filtering the current branch.

* "git-instaweb" no longer fails on Mac OS X.

* "git-cvsexportcommit" didn't always create new parent directories
before trying to create new child directories. Fixed.

* "git-fetch" printed a scary (but bogus) error message while
fetching a tag that pointed to a tree or blob. The error did
not impact correctness, only user perception. The bogus error
is no longer printed.

* "git-ls-files --ignored" did not properly descend into non-ignored
directories that themselves contained ignored files if d_type
was not supported by the filesystem. This bug impacted systems
such as AFS. Fixed.

* Git segfaulted when reading an invalid .gitattributes file. Fixed.

* post-receive-email example hook fixed was fixed for
non-fast-forward updates.

* Documentation updates for supported (but previously undocumented)
options of "git-archive" and "git-reflog".

* "make clean" no longer deletes the configure script that ships
with the git tarball, making multiple architecture builds easier.

* "git-remote show origin" spewed a warning message from Perl
when no remote is defined for the current branch via
branch..remote configuration settings.

* Building with NO_PERL_MAKEMAKER excessively rebuilt contents
of perl/ subdirectory by rewriting perl.mak.

* http.sslVerify configuration settings were not used in scripted
Porcelains.

* "git-add" leaked a bit of memory while scanning for files to add.

* A few workarounds to squelch false warnings from recent gcc have
been added.

* "git-send-pack $remote frotz" segfaulted when there is nothing
named 'frotz' on the local end.

* "git-rebase -interactive" did not handle its "--strategy" option
properly.

----------------------------------------------------------------

Changes since v1.5.3.4 are as follows:

Alex Bennee (1):
Ensure we add directories in the correct order

Alex Riesen (1):
Fix generation of perl/perl.mak

Andrew Clausen (1):
helpful error message when send-pack finds no refs in common.

Aurelien Bompard (1):
honor the http.sslVerify option in shell scripts

Benoit Sigoure (1):
Fix a small memory leak in builtin-add

Bj旦rn Steinbrink (3):
Fix --strategy parsing in git-rebase--interactive.sh
git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.
git-rebase--interactive.sh: Make 3-way merge strategies work for -p.

Brian Gernhardt (1):
cvsserver: Use exit 1 instead of die when req_Root fails.

Frank Lichtenheld (1):
git-config: don't silently ignore options after --list

Gerrit Pape (2):
git-config: handle --file option with relative pathname properly
git-config: print error message if the config file cannot be read

Jean-Luc Herren (2):
git add -i: Fix parsing of abbreviated hunk headers
git add -i: Remove unused variables

Jeff King (1):
send-pack: respect ' ' on wildcard refspecs

Joakim Tjernlund (1):
Improve receive-pack error message about funny ref creation

Johannes Schindelin (5):
clear_commit_marks(): avoid deep recursion
rebase -i: use diff plumbing instead of porcelain
Fix setup_git_directory_gently() with relative GIT_DIR & GIT_WORK_TREE
fix filter-branch documentation
filter-branch: update current branch when rewritten

Julian Phillips (1):
fast-import: Fix argument order to die in file_change_m

Junio C Hamano (8):
git-remote: fix "Use of uninitialized value in string ne"
sha1_file.c: avoid gcc signed overflow warnings
merge-recursive.c: mrtree in merge() is not used before set
RelNotes-1.5.3.5: describe recent fixes
Prevent send-pack from segfaulting (backport from 'master')
git-merge: document but discourage the historical syntax
Update GIT 1.5.3.5 Release Notes
GIT 1.5.3.5

Lars Hjemli (1):
Make merge-recursive honor diff.renamelimit

Linus Torvalds (6):
Fix embarrassing "git log --follow" bug
Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT
git-blame shouldn't crash if run in an unmerged tree
Avoid scary errors about tagged trees/blobs during git-fetch
Fix directory scanner to correctly ignore files without d_type
Fix diffcore-break total breakage

Mathias Megyei (1):
Do not remove distributed configure script

Michael W. Olson (1):
Documentation/git-cvsexportcommit.txt: s/mgs/msg/ in example

Michele Ballabio (2):
git-reflog: document --verbose
git-archive: document --exec

Nicolas Pitre (1):
cherry-pick/revert: more compact user direction message

Patrick Welche (1):
Define NI_MAXSERV if not defined by operating system

Ralf Wildenhues (1):
gitk.txt: Fix markup.

Robert Schiele (1):
fixing output of non-fast-forward output of post-receive-email

Sergei Organov (1):
core-tutorial: Use new syntax for git-merge.

Shawn O. Pearce (17):
git-gui: Display message box when we cannot find git in $PATH
git-gui: Handle starting on mapped shares under Cygwin
git-gui: Ensure .git/info/exclude is honored in Cygwin workdirs
git-gui: Allow gitk to be started on Cygwin with native Tcl/Tk
git-gui: Don't crash when starting gitk from a browser session
Whip post 1.5.3.4 maintenance series into shape.
Correct typos in release notes for 1.5.3.5
Avoid 'expr index' on Mac OS X as it isn't supported
Document additional 1.5.3.5 fixes in release notes
Yet more 1.5.3.5 fixes mentioned in release notes
Avoid invoking diff drivers during git-stash
Further 1.5.3.5 fixes described in release notes
Paper bag fix diff invocation in 'git stash show'
git-gui: Correctly report failures from git-write-tree
git-gui: Handle progress bars from newer gits
git-gui: Don't display CR within console windows
Describe more 1.5.3.5 fixes in release notes

Simon Sasburg (1):
git-gui: Avoid using bold text in entire gui for some fonts

Steffen Prohaska (2):
git-gui: accept versions containing text annotations, like 1.5.3.mingw.1
attr: fix segfault in gitattributes parsing code

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

[ANNOUNCE] GIT 1.5.3.4

Posted over 2 years ago by Junio C Hamano

The latest maintenance release GIT 1.5.3.4 is available at the
usual places:

http://www.kernel.org/pub/software/scm/git/

git-1.5.3.4.tar.{gz,bz2} (tarball)
git-htmldocs-1.5.3.4.tar.{gz,bz2} (preformatted docs)
... [More] git-manpages-1.5.3.4.tar.{gz,bz2} (preformatted docs)
RPMS/$arch/git-*-1.5.3.4-1.$arch.rpm (RPM)

GIT v1.5.3.4 Release Notes
==========================

Fixes since v1.5.3.3
--------------------

* Change to "git-ls-files" in v1.5.3.3 that was introduced to support
partial commit of removal better had a segfaulting bug, which was
diagnosed and fixed by Keith and Carl.

* Performance improvements for rename detection has been backported
from the 'master' branch.

* "git-for-each-ref --format='%(numparent)'" was not working
correctly at all, and --format='%(parent)' was not working for
merge commits.

* Sample "post-receive-hook" incorrectly sent out push
notification e-mails marked as "From: " the committer of the
commit that happened to be at the tip of the branch that was
pushed, not from the person who pushed.

* "git-remote" did not exit non-zero status upon error.

* "git-add -i" did not respond very well to EOF from tty nor
bogus input.

* "git-rebase -i" squash subcommand incorrectly made the
author of later commit the author of resulting commit,
instead of taking from the first one in the squashed series.

* "git-stash apply --index" was not documented.

* autoconfiguration learned that "ar" command is found as "gas" on
some systems.

----------------------------------------------------------------

Changes since v1.5.3.3 are as follows:

Andy Parkins (1):
post-receive-hook: Remove the From field from the generated email header so that the pusher's name is used

Carl Worth (1):
Add test case for ls-files --with-tree

Federico Mena Quintero (4):
Say when --track is useful in the git-checkout docs.
Add documentation for --track and --no-track to the git-branch docs.
Note that git-branch will not automatically checkout the new branch
Make git-pull complain and give advice when there is nothing to merge with

Jari Aalto (1):
git-remote: exit with non-zero status after detecting errors.

Jean-Luc Herren (2):
git-add--interactive: Allow Ctrl-D to exit
git-add--interactive: Improve behavior on bogus input

Jeff King (1):
diffcore-rename: cache file deltas

Johan Herland (1):
Mention 'cpio' dependency in INSTALL

Johannes Schindelin (2):
rebase -i: squash should retain the authorship of the _first_ commit
Fix typo in config.txt

Junio C Hamano (5):
Whip post 1.5.3.3 maintenance series into shape.
git-commit: initialize TMP_INDEX just to be sure.
for-each-ref: fix %(numparent) and %(parent)
rename diff_free_filespec_data_large() to diff_free_filespec_blob()
GIT 1.5.3.4

Keith Packard (1):
Must not modify the_index.cache as it may be passed to realloc at some point.

Miklos Vajna (1):
git stash: document apply's --index switch

Robert Schiele (1):
the ar tool is called gar on some systems

Steffen Prohaska (1):
fixed link in documentation of diff-options

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

[ANNOUNCE] qgit-2.0

Posted over 2 years ago by Marco Costalba

This is the final qgit-2.0

With qgit you will be able to browse revision histories, view patch content
and changed files, graphically following different development branches.

IMPORTANT NOTE
git 1.5.3 or better is required ... [More] , Qt 4.3 or better is required.

FEATURES

- View revisions, diffs, files history, files annotation, archive tree.

- Commit changes visually cherry picking modified files.

- Apply or format patch series from selected commits, drag and
drop commits between two instances of qgit.

- Associate commands sequences, scripts and anything else executable
to a custom action. Actions can be run from menu and corresponding
output is grabbed by a terminal window.

- qgit implements a GUI for the most common StGIT commands like push/pop
and apply/format patches. You can also create new patches or refresh
current top one using the same semantics of git commit, i.e. cherry
picking single modified files.

NEW IN THIS RELEASE

This is the final public release of the shining new qgit 2.0 based on
the shining new Qt 4.3 libraries.

All the features of the stable series have been ported. In addition this
new release sports a better GUI both on visually side and on usability side.

Annotation code is much improved in speed and in power, as example
now follows file renames, try it on any git tree file to see a real example.

A new and much improved repository browsing experience is now possible,
in particular you don't need to switch to patch tab to view diff
content anymore. Patch information, together with patch description,
is shown in bottom left pane.

Finally, qgit works natively under Windows due to Qt 4.3 libraries.

The detailed list of changes is very long and interested people can
read from public qgit repository.

Although there are a lot of new features code is considered stable due
to have been very long in 'rc' state.

You can download the tarball from
http://sourceforge.net/projects/qgit

or clone the public git repository at
git://git.kernel.org/pub/scm/qgit/qgit4.git

Please, check the shipped README for detailed build and install information.

Have fun
Marco
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

[ANNOUNCE] GIT 1.5.3.3

Posted over 2 years ago by Junio C Hamano

The latest maintenance release GIT 1.5.3.3 is available at the
usual places:

http://www.kernel.org/pub/software/scm/git/

git-1.5.3.3.tar.{gz,bz2} (tarball)
git-htmldocs-1.5.3.3.tar.{gz,bz2} (preformatted docs)
... [More] git-manpages-1.5.3.3.tar.{gz,bz2} (preformatted docs)
RPMS/$arch/git-*-1.5.3.3-1.$arch.rpm (RPM)

GIT v1.5.3.3 Release Notes
==========================

Fixes since v1.5.3.2
--------------------

* git-quiltimport did not like it when a patch described in the
series file does not exist.

* p4 importer missed executable bit in some cases.

* The default shell on some FreeBSD did not execute the
argument parsing code correctly and made git unusable.

* git-svn incorrectly spawned pager even when the user user
explicitly asked not to.

* sample post-receive hook overquoted the envelope sender
value.

* git-am got confused when the patch contained a change that is
only about type and not contents.

* git-mergetool did not show our and their version of the
conflicted file when started from a subdirectory of the
project.

* git-mergetool did not pass correct options when invoking diff3.

* git-log sometimes invoked underlying "diff" machinery
unnecessarily.

----------------------------------------------------------------

Changes since v1.5.3.2 are as follows:

Carlos Rica (1):
Move make_cache_entry() from merge-recursive.c into read-cache.c

Dan Nicholson (1):
quiltimport: Skip non-existent patches

David Brown (1):
Detect exec bit in more cases.

David Kastrup (1):
Supplant the "while case ... break ;; esac" idiom

Eric Wong (1):
git-svn: don't attempt to spawn pager if we don't want one

Glenn Rempe (1):
Fixed minor typo in t/t9001-send-email.sh test command line.

J. Bruce Fields (1):
user-manual: don't assume refs are stored under .git/refs

Jakub Narebski (2):
gitweb: Remove parse_from_to_diffinfo code from git_patchset_body
gitweb: No difftree output for trivial merge

Jim Meyering (2):
unexpected Make output (e.g. from --debug) causes build failure
Do not over-quote the -f envelopesender value.

Johannes Schindelin (1):
apply: get rid of --index-info in favor of --build-fake-ancestor

Johannes Sixt (2):
gitattributes.txt: Remove a duplicated paragraph about 'ident' and 'crlf' interaction.
gitattributes.txt: Be more to the point in the filter driver description.

Junio C Hamano (3):
Documentation/git-lost-found.txt: drop unnecessarily duplicated name.
Mergetool generating blank files (1.5.3)
GIT 1.5.3.3

Linus Torvalds (1):
Fix revision log diff setup, avoid unnecessary diff generation

Matt Kraai (2):
Move the paragraph specifying where the .idx and .pack files should be
Conjugate "search" correctly in the git-prune-packed man page.

Michael Smith (1):
user-manual: Explain what submodules are good for.

Miklos Vajna (2):
User Manual: add a chapter for submodules
git-bundle: fix commandline examples in the manpage

Randy Dunlap (1):
core-tutorial: correct URL

Shawn Bohrer (1):
Fix spelling of overridden in documentation

Theodore Ts'o (2):
mergetool: fix emerge when running in a subdirectory
mergetool: Fix typo in options passed to kdiff3

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

[ANNOUNCE] tig-0.9.1

Posted over 2 years ago by Jonas Fonseca

Hello,

I would like to announce the next installment of tig, which mainly
brings a bunch of fixes. However, there was also room for a few new
features, such as support for cherry-picking to the current branch
(bound to 'C' by ... [More] default), refreshing of the status view (bound to 'R'),
as well as better handling of unmerged entries in the status view by
suggesting users to launch git-mergetool (by default wired to 'M').

For tig-0.10, I hope to finally get time to finish splitting up the
tig.c file into more manageable pieces. It might also be the release
that will try to get handling of different encodings right by using
wchar_t.

What is tig?
------------
Tig is a ncurses-based text-mode interface for git. It can mainly
function as a git repository browser but can also additionally can act
as a pager for output from various git commands.

Homepage: http://jonas.nitro.dk/tig/
Manual: http://jonas.nitro.dk/tig/manual.html
Tarballs: http://jonas.nitro.dk/tig/releases/
Gitfeed: git://repo.or.cz/tig.git
Gitweb: http://repo.or.cz/w/tig.git

Changes in this release
-----------------------
Below is the diffstat and shortlog for changes made in this release.

.gitignore | 2
Makefile | 26 ---
SITES | 2 -
VERSION | 2 -
acinclude.m4 | 62
configure.ac | 41 ------------
manual.txt | 4
tig.1.txt | 4
tig.c | 198 ---------
tigrc.5.txt | 3
10 files changed, 265 insertions( ), 79 deletions(-)

Jonas Fonseca (21):
tig-0.9.1.git
Use the more advanced iconv.m4 script from ELinks
Oops, always ensure that ICONV_CONST is defined
Support cherry-picking commits in main view to current branch
Handle REQ_NONE upfront in view_driver
Fix open_editor to make the file path relative to the project root
Fix out-of-range lineno when reloading the status view
Fix the clean rule to never remove generated doc files
Include autoconf file for 'make dist'
Remove unused 'view' argument from open_editor
Add support for refreshing/reloading the status view
Also ignore generated .md5 files for tarballs
Never put the release number in the tarball name for tagged versions
Ignore REQ_NONE in the help view and improve unbound request handling
Document the refresh request
Detect working trees and disable the status view when it is missing
Refactor code to open_external_viewer
Add support for launching git-mergetool from the status view
Cleanup status_request to make it reload the status view by default
SITES: 'Tarballs' is a bit more telling than 'Releases'
tig-0.9.1

--
Jonas Fonseca
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]