Stacked GIT 0.10 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 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.
The main features in this release:
* Handle branch names with slashes
* Testsuite framework
* Configurable file extensions for merge conflicts
* 'goto' command, equivalent to 'pop --to' or 'push --to'
* '--update' option for 'pick' to only fold the changes to files
already in the current patch
* '--replace' option for 'import' to replace existing patches in
the series
* Look for templates in ~/.stgit/templates as well
* Allow multiple patch names on the 'push' command line
* Classify commands in 'stg --help' output
* Bug fixes
Acknowledgements (generated with 'git shortlog'):
Catalin Marinas:
Allow git.checkout() to work on unmerged indexes
Fix the added to both but different conflict
Fix git.reset() to remove the added files
Allow configurable file extensions for merge conflicts
Add the --update option to pick
Implement the 'goto' command
Add the --replace option to import
Fix the t1201-pull-trailing.sh test
Show the stderr for failed GIT commands
Generate an empty commit for the newly created patches
Fix the add and rm commands to fail if no patch is applied
Fix the t0001-subdir-branches.sh test
Update the TODO file
Release 0.10
Karl Hasselström:
Fix infinite recursion on absolute paths
Fix indexing error during "diff -r/"
Explicitly specify utf-8 coding in file
Karl Hasselström:
Don't die when there are no branches
Handle branch names with slashes
Tests for branch names with slashes
Pavel Roskin:
Add .gitignore files, list generated files there
Add a simple makefile
Yann Dirson:
Add a testsuite framework copied from git-core
Add list of bugs to TODO
Add a couple of safety checks to series creation
Make branch creation atomic
Correctly handle refs/patches on series rename
Fix a seriously bad interaction between .git caching and repo cloning
Test that pulls a patch creating a file that got modified afterwards
Exercise "stg pull" on patches just appending lines.
Look for templates in ~/.stgit/templates as well
Fixes to the pull testcases.
Allow to specify multiple patch names on push command-line
Classify commands in stg --help output.
--
Catalin
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]