~mdw / stgit / search
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Do simple in-index merge with diff+apply instead of read-tree
2008-07-24 Karl HasselströmDo simple in-index merge with diff+apply instead of...
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-07-24 Karl HasselströmDiscard stderr output from git apply if the caller...
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-07-24 Karl HasselströmFix uncommit status message
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-07-24 Karl HasselströmMake sure that stg uncommit doesn't touch the branch...
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-07-24 Karl Hasselströmstg uncommit should never touch the branch head
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-07-24 Karl HasselströmTest for exit code with command_error()
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-07-24 Karl HasselströmMerge branch 'stable'
 commit | commitdiff | tree
2008-07-18 Karl HasselströmTest that we can add a new file to a non-topmost patch...
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-07-08 Karl HasselströmTest for "stg edit"
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-07-08 Karl HasselströmTest for specific exit code
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-07-08 Karl HasselströmTest "stg status" with -M in stgit.diff-opts
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-07-08 Karl HasselströmMerge branch 'stable'
 commit | commitdiff | tree
2008-07-08 Karl HasselströmDon't allow extra diff options with "stg status"
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-07-08 Karl HasselströmTest "stg status" with renames
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-06-29 Karl HasselströmMerge branch 'stable' into stable-master-merge
 commit | commitdiff | tree
2008-06-29 Karl HasselströmFix "stg sink" with no applied patches (bug 11887)
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-06-29 Karl HasselströmTry "stg sink" without applied patches
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-06-12 Karl HasselströmFix typo
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-06-03 Karl HasselströmSome API documentation for the new infrastructure
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-06-03 Karl HasselströmWrap the text of error messages
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-06-03 Karl HasselströmMerge branch 'stable' into stable-master-merge
 commit | commitdiff | tree
2008-06-03 Karl HasselströmHandle refresh of changed files with non-ASCII names
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-06-03 Karl HasselströmTest for another filename quoting issue in tree_status()
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-06-02 Karl HasselströmHandle changed files with non-ASCII names
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-06-02 Karl HasselströmAdd rebase test for when upstream has deleted a non...
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-05-20 Karl HasselströmAdd property with a list of all patch names
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-05-20 Karl HasselströmPrevent most commands from running when there are conflicts
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-05-20 Karl HasselströmEmacs mode: delete patches
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-05-20 Karl HasselströmConvert "stg delete" to the new infrastructure
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-05-20 Karl HasselströmEmacs mode: use "stg new --file"
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-05-20 Karl HasselströmLet "stg new" support more message options
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-05-20 Karl HasselströmRefactor --author/--committer options
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-05-20 Karl HasselströmConvert "stg new" to the new infrastructure
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-05-20 Karl HasselströmDisable patchlog test for "stg new"
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-05-20 Karl HasselströmTry the built-in version string before git-describe
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-05-14 Karl HasselströmEmacs mode: automatically cd up to root of worktree
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-05-13 Karl HasselströmBetter StGit version tracking
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-05-13 Karl HasselströmImport version to a separate namespace
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-05-08 Karl HasselströmRemove "stg" from start of log messages
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-04-20 Karl HasselströmUse test_cmp instead of diff -u in the test suite
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-04-20 Karl HasselströmGet rid of backticks in test-lib.sh
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-04-20 Karl HasselströmSteal more test-lib.sh updates from git
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-04-20 Karl HasselströmUse hardcoded author and committer names in tests
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-04-20 Karl HasselströmHandle commandline parsing errors gracefully
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-04-15 Karl HasselströmIf a patch is not changed when pushing, reuse the same...
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-04-15 Karl Hasselströmemacs mode: handle "stg status" output with #
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-04-15 Karl HasselströmLog environment and cwd as well as the actual command
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-04-15 Karl HasselströmDon't both change directory and set GIT_WORK_TREE
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-04-14 Karl HasselströmMerge branch 'stable' into stable-master-merge
 commit | commitdiff | tree
2008-04-14 Karl HasselströmMake t1003-new executable
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-04-13 Karl HasselströmFix problems in t1000-branch-create
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-03-24 Karl HasselströmMake documentation less confusing
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-03-20 Karl HasselströmHandle failed pushes differently depending on cause
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-03-20 Karl HasselströmNew test: conflicting push in dirty worktree
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-03-20 Karl HasselströmMake sure that we only uncommit commits with exactly...
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-03-20 Karl HasselströmTry uncommitting a commit with not exactly one parent
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-03-20 Karl HasselströmMake sure patches with no parents have an empty list...
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-03-20 Karl HasselströmUse a special exit code for bugs
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-02-12 Karl HasselströmEmacs mode: change "stg repair" binding
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-02-12 Karl HasselströmRemove unused data field
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-02-10 Karl HasselströmEmacs mode: It's possible to edit unapplied patches now
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-02-10 Karl HasselströmConvert "stg edit" to the new infrastructure
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-02-10 Karl HasselströmParse the date instead of treating it as an opaque...
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-02-10 Karl HasselströmTeach new infrastructure to diff two trees
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-02-10 Karl HasselströmTeach new infrastructure to apply patches
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-02-10 Karl HasselströmTeach new infrastructure about the default author and...
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-02-10 Karl HasselströmRead default diff options from the user's config
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-02-10 Karl HasselströmLet "stg show" use the unified --diff-opts handling
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-02-10 Karl HasselströmReduce number of backslashes by using raw strings
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-02-10 Karl HasselströmMake documentation less confusing
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-02-10 Karl HasselströmDon't check out files if we don't have index+workdir
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-01-29 Karl HasselströmDon't clean away patches with conflicts
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-01-29 Karl HasselströmLet the caller supply the diff text to diffstat()
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-01-29 Karl HasselströmSimplify editor selection logic
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-01-29 Karl HasselströmEliminate temp variable that's used just once
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-01-29 Karl HasselströmWrap excessively long line
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-01-29 Karl HasselströmCreate index and worktree objects just once
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-01-24 Karl HasselströmRefactor --diff-opts handling
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-01-24 Karl HasselströmRemove unused default values
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-01-24 Karl HasselströmHomogenize buffer names
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-01-24 Karl HasselströmDon't keep old committer when rewriting a commit
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-01-09 Karl HasselströmMake "stg goto" subdirectory safe
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-01-09 Karl HasselströmTest that "stg goto" can be called from a subdirectory
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-01-09 Karl HasselströmMake "stg commit" fancier
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-01-09 Karl HasselströmConvert "stg commit" to new infrastructure
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-01-09 Karl HasselströmSet exit code to 3 on merge conflict
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-01-09 Karl Hasselströmstg coalesce: Support --file and --save-template
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-01-09 Karl HasselströmExpose transaction abort function
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-01-09 Karl HasselströmNew infrastructure: Make sure that the branch is initialized
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-01-09 Karl HasselströmConvert "stg uncommit" to the new infrastructure
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-01-09 Karl HasselströmLet "stg goto" use the new infrastructure
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-01-09 Karl HasselströmLet "stg clean" use the new transaction primitives
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2008-01-09 Karl HasselströmTeach the new infrastructure about the index and worktree
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-12-19 Karl HasselströmLet "stg applied" and "stg unapplied" use the new infrastructure
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-12-19 Karl HasselströmAdd "stg coalesce"
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-12-19 Karl HasselströmLet "stg clean" use the new infrastructure
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-12-19 Karl HasselströmUpgrade older stacks to newest version
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-12-19 Karl HasselströmWrite metadata files used by the old infrastructure
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-12-19 Karl HasselströmNew StGit core infrastructure: repository operations
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
2007-12-19 Karl HasselströmRemove "stg cp"
Signed-off-by: Karl Hasselström <kha@treskal.com>
 commit | commitdiff | tree
next
GIT patch-maintenance porcelain (local modifications)