Add mergetool support to the classic StGit infrastructure
[stgit] / stgit / git.py
2009-04-09 Catalin MarinasAdd mergetool support to the classic StGit infrastructure
2009-01-28 Catalin MarinasMerge branch 'stable'
2009-01-28 Catalin MarinasPass the diff flags when statistics are required
2009-01-22 Karl HasselströmMerge branch 'stable'
2008-09-28 Karl HasselströmMerge branch 'stable'
2008-09-21 Karl HasselströmRefactor stgit.commands.edit
2008-09-19 Catalin MarinasMerge branch 'stable'
2008-09-09 Catalin MarinasMerge branch 'stable'
2008-08-26 Karl HasselströmMerge branch 'stable'
2008-07-24 Karl HasselströmMerge branch 'stable'
2008-07-08 Karl HasselströmMerge branch 'stable'
2008-07-08 Karl HasselströmDon't allow extra diff options with "stg status"
2008-06-29 Karl HasselströmMerge branch 'stable' into stable-master-merge
2008-06-08 Catalin MarinasMerge branch 'stable'
2008-06-03 Catalin MarinasMerge branch 'stable'
2008-06-03 Karl HasselströmMerge branch 'stable' into stable-master-merge
2008-06-03 Karl HasselströmHandle refresh of changed files with non-ASCII names
2008-06-02 Karl HasselströmHandle changed files with non-ASCII names
2008-05-27 Catalin MarinasMerge branch 'stable'
2008-05-27 Catalin MarinasFix "refresh" failure with moved files (bug 11661)
2008-05-19 Catalin MarinasMerge branch 'stable'
2008-04-17 Catalin MarinasMerge branch 'stable'
2008-04-14 Karl HasselströmMerge branch 'stable' into stable-master-merge
2008-03-25 Catalin MarinasMerge branch 'stable'
2008-01-29 Karl HasselströmLet the caller supply the diff text to diffstat()
2007-12-19 Catalin MarinasRemove unused git functions like add, rm, copy
2007-12-19 Catalin MarinasRemove multiple stages returned by git.ls_files
2007-12-19 Catalin MarinasDon't assume there is always a stage 2 in git.get_conflicts
2007-12-19 Catalin MarinasRe-add the interactive merge
2007-12-19 David KågedalAsk git about unmerged files
2007-12-19 Karl HasselströmNicer conflict markers
2007-12-19 David KågedalUse the output from merge-recursive to list conflicts
2007-12-19 David KågedalSimplify merge_recursive
2007-12-19 David KågedalLeave working dir and index alone after failed (conflic...
2007-12-19 David KågedalSplit git.merge into two functions
2007-12-09 Catalin MarinasBetter handling of binary files (bug #8495)
2007-12-07 Catalin Marinasgit.pretty_commit() re-implemented with "git show"...
2007-12-04 Catalin MarinasClean-up if the branch creation fails (bug #10015)
2007-12-01 Catalin MarinasCheck for disappeared newborn files in git.tree_status...
2007-11-14 Catalin MarinasExecute the 'git ...' rather than 'git-...'
2007-11-14 Catalin Marinas'stg pop --keep' doesn't update the index
2007-10-23 Catalin MarinasAllow StGIT commands to run correctly in subdirectories
2007-10-17 Catalin MarinasDo not raise an exception if no FETCH_HEAD
2007-10-08 Karl HasselströmProperly detect that HEAD is detached
2007-10-07 Karl HasselströmDiscard stderr output from git-rev-parse
2007-10-07 Karl HasselströmMake a common superclass for all StGit exceptions
2007-10-07 Yann DirsonBetter diagnostic for wrong branch configuration.
2007-09-28 Catalin MarinasFix the rebasing with an external command
2007-09-23 David KågedalMoved that status function to the status command file
2007-09-23 David KågedalClear up semantics of tree_status
2007-09-14 Catalin MarinasAdd patch editing command
2007-09-11 Karl HasselströmInclude summary of added/deleted files in diffstat
2007-09-11 Karl HasselströmDiscard stderr when determining if a patch is already...
2007-09-05 Pavel Roskingit.__remotes_from_dir() should only return lists
2007-09-04 Karl HasselströmUse the builtin set() instead of sets.Set()
2007-08-31 Karl HasselströmLet "stg status" ignore empty directories
2007-08-31 David KågedalCleanup tree_status and use -z
2007-08-26 Karl HasselströmRefactor subprocess creation
2007-08-26 Karl HasselströmRefactor output handling to break circular dependency
2007-08-26 Karl HasselströmCompile regexp just once
2007-08-23 Karl HasselströmDon't touch ref files manually
2007-08-20 Karl HasselströmTeach StGIT about core.excludesfile
2007-07-16 Catalin MarinasDo not call 'refresh' when creating a patch (bug #8872)
2007-06-25 Yann DirsonRevert part of the reverted commit that we want to...
2007-06-22 Catalin MarinasModify the 'patches' command to use the locally modifie...
2007-06-15 Yann DirsonRevert 'Changed rebasing safety check to look for reach...
2007-06-12 Catalin MarinasShow a joined string rather than list when reporting...
2007-06-12 Yann DirsonChanged rebasing safety check to look for reachability...
2007-06-02 Yann DirsonAdd new --diff-opts/-O flag to diff- and status-related...
2007-06-02 Yann DirsonMake diff flags handling more modular.
2007-06-02 Yann DirsonCall external commands without a shell where possible.
2007-05-21 Karl HasselströmRefactor message printing
2007-05-21 Karl HasselströmAdd --binary flag to commands that generate diffs
2007-05-14 Karl HasselströmFix popping on non-active branches
2007-04-17 Catalin MarinasFailed recursive merging can silently lose date in...
2007-03-12 Yann DirsonMake 'stg cp' 2nd form safe.
2007-03-12 Yann DirsonAdd 'stg cp' command.
2007-02-23 Catalin MarinasAdd --branch option to 'patches'
2007-02-21 Yann DirsonRework of the 'stg pull' policy.
2007-02-13 Catalin MarinasFix the behaviour when there is no user information...
2007-02-05 Yann DirsonUse branch.*.stgit.parentbranch for authoritative paren...
2007-02-03 Yann DirsonUse FETCH_HEAD to know where to rebase to after pull. master
2007-02-02 Pavel RoskinAllow .git/branches and .git/remotes to be missing
2007-02-02 Yann DirsonRebase to parent branch after git-fetch in "stg pull".
2007-02-01 Catalin Marinasset() is not a builtin function in Python 2.3
2007-01-31 Yann DirsonMake 'stg pull' use git-fetch and not git-pull.
2007-01-31 Yann DirsonAllows extraction of information about remotes.
2007-01-31 Yann DirsonMake stgit.config use git-repo-config.
2007-01-21 Catalin MarinasFix the displaying of unknown files for 'stg status'
2007-01-04 Catalin MarinasFix the branch renaming to also rename the reflogs
2006-12-08 Catalin MarinasDon't always use git-merge-recursive because of speed
2006-12-07 Catalin MarinasAdd the 'sync' command
2006-12-07 Catalin MarinasFix a merge case with files added in both heads but...
2006-12-05 Karl HasselströmAsk git for author and committer name
2006-12-05 Catalin MarinasOnly print the progress message if on a TTY
2006-11-16 Karl HasselströmPrint progress message to stderr, not stdout
2006-11-09 Catalin MarinasAdd file renaming support
2006-11-08 Chuck LeverOptionally repack the object repository after every...
2006-11-08 Chuck LeverPrint a message while checking for changes in the worki...
2006-11-08 Catalin MarinasAdd mbox support to "import"
next