~mdw / stgit / search
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Better error message if merge fails
2007-12-11 Catalin MarinasRelease 0.14.1
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-12-09 Catalin MarinasRelease 0.14
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-12-09 Catalin MarinasBetter handling of binary files (bug #8495)
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-12-08 Catalin MarinasAllow only certain gitk exit codes as valid
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-12-07 Catalin MarinasMake sure the refid given to 'mail' has the angle brackets
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-12-07 Catalin MarinasSome clean-up of the branch manipulation commands
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-12-07 Catalin MarinasIgnore the gitk exit code in 'stg log -g' (bug #10010)
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-12-07 Catalin MarinasAdd the 'log --number' option to limit the output
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-12-07 Catalin MarinasChange the file timestamp in 'resolved --reset' (bug...
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-12-07 Catalin MarinasAllow 'show' and 'id' to work on non-StGIT branches...
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-12-07 Catalin Marinasgit.pretty_commit() re-implemented with "git show"...
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-12-07 Catalin MarinasCheck the minimum required versions of GIT and Python...
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-12-07 Catalin MarinasAdd a test for the 'mail --attach' command
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-12-06 Catalin MarinasAllow multipart templates for patch e-mails (bug #10237)
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-12-04 Catalin MarinasClean-up if the branch creation fails (bug #10015)
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-12-03 Catalin MarinasCorrectly identify the parent branch (bug #10014)
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-12-01 Catalin MarinasCheck for disappeared newborn files in git.tree_status...
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-12-01 Catalin MarinasMake Series.refresh_patch automatically save the undo...
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-11-27 Catalin MarinasImprove the t1205 test for push
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-11-27 Catalin MarinasKeep the patch log when import --replace deletes patches
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-11-14 Catalin MarinasExecute the 'git ...' rather than 'git-...'
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-11-14 Catalin Marinas'stg pop --keep' doesn't update the index
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-11-12 Catalin MarinasAllow the diff showing in the log command if patch...
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-11-07 Catalin MarinasFix more commands to run correctly in subdirectories
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-11-02 Catalin MarinasAllow "branch --create" to be given a tag id
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-10-23 Catalin MarinasAllow StGIT commands to run correctly in subdirectories
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-10-17 Catalin MarinasDo not raise an exception if no FETCH_HEAD
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-10-17 Catalin Marinas"stg pop --keep" fails because of git-apply --index...
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-10-17 Catalin MarinasFix assertion in patch creation
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-09-28 Catalin MarinasFix the rebasing with an external command
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-09-27 Catalin MarinasAllow the rebase command to be defined
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-09-22 Catalin MarinasPrint 'updating patch' earlier in 'edit'
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-09-14 Catalin MarinasAdd 'edit' to the patchcommands list
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-09-14 Catalin MarinasAdd patch editing command
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-08-29 Catalin MarinasAdd the '--exclusive' option to 'uncommit'
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-08-29 Catalin MarinasMake the maximum patch name length configurable
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-08-23 Catalin MarinasAllow 'import' to apply empty patches
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-07-25 Catalin MarinasRelease 0.13
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-07-25 Catalin MarinasAdd .mailmap file
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-07-17 Catalin MarinasModify the assertion in Series.new_patch
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-07-17 Catalin MarinasAllow refresh --annotate to replace the top log entry
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-07-16 Catalin MarinasAdd the '--expose' option to 'pick'
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-07-16 Catalin MarinasDo not call 'refresh' when creating a patch (bug #8872)
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-07-16 Catalin MarinasAllow 'refresh' to annotate the patch log entries
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-07-13 Catalin MarinasAdd --keep option to goto
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-07-13 Catalin MarinasAdd '--update' option to 'refresh'
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-07-13 Catalin MarinasAdd the --unrelated option to mail
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-07-13 Catalin Marinas'sync' code comments clean-up after commit 6b79a09c
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-06-22 Catalin MarinasFix the importing of multipart emails
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-06-22 Catalin MarinasModify the 'patches' command to use the locally modified...
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-06-21 Catalin MarinasPass a string rather than an exception object in gitmergeonefile
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-06-12 Catalin MarinasShow a joined string rather than list when reporting...
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-06-08 Catalin MarinasAdd my release scripts to the contrib directory
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-06-08 Catalin MarinasFactor out common functionality into the utils.py file
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-06-08 Catalin MarinasFix the hidden patches functionality (bug #9077)
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-06-07 Catalin MarinasFix bug #9284 - error messages include abbreviated...
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-05-22 Catalin MarinasFix the automatic patch name generation for the pick...
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-05-21 Catalin MarinasAdd a "make tags" target
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-05-15 Catalin MarinasUse list comprehension in uncommit.py for Python 2.3
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-05-15 Catalin MarinasFix typo in the patchlogs copying code
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-04-17 Catalin MarinasFailed recursive merging can silently lose date in...
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-04-11 Catalin MarinasRevert commit "Move man page stg(1) to stg(7)"
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-04-11 Catalin MarinasFix the 'bury' command completion to include all patches
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-04-10 Catalin MarinasMove man page stg(1) to stg(7)
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-04-10 Catalin MarinasAdd --description option to branch
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-03-12 Catalin MarinasOnly check for upstream merges if not fast-forwarding
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-03-06 Catalin Marinas[Revert] Make 'push --undo' safer
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-02-28 Catalin MarinasUse and..or as a ternary operator rather than a dictionary
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-02-28 Catalin MarinasAdd EditorException to stgit/utils.py
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-02-28 Catalin MarinasAdd an interractive 2-way merge option
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-02-23 Catalin MarinasAdd --branch option to 'patches'
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-02-21 Catalin MarinasFix the mail command to parse longer address headers
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-02-21 Catalin MarinasFix the alias check in the mail --bcc command
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-02-21 Catalin MarinasDisplay whether the patch is empty after refresh
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-02-17 Catalin MarinasFix import to allow --name and --strip for most import...
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-02-16 Catalin MarinasAdd --author option to series
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-02-16 Catalin MarinasAllow importing mbox files from stdin
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-02-13 Catalin MarinasFix the behaviour when there is no user information...
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-02-13 Catalin MarinasMake StGIT aware of the STGIT_DEBUG_LEVEL environment...
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-02-06 Catalin MarinasRelease 0.12
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-02-06 Catalin MarinasAdd extra files to MANIFEST.in
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-02-06 Catalin MarinasEscape the quotes in example/gitconfig
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-02-05 Catalin MarinasStop the e-mail sending if editor fails
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-02-02 Catalin MarinasCheck for invalid patch names before acting
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-02-01 Catalin Marinasset() is not a builtin function in Python 2.3
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-01-26 Catalin MarinasMake the 'series --short' length configurable
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-01-26 Catalin MarinasAdd support to hide and unhide patches
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-01-25 Catalin Marinas'--showbranch' and '--noprefix' options for 'series'
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-01-25 Catalin MarinasAllow a patch range to be specified for 'series'
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-01-25 Catalin MarinasHide the test_create_repo output
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-01-25 Catalin MarinasSynchronise the current patch if none specified for...
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-01-21 Catalin MarinasFix the displaying of unknown files for 'stg status'
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-01-12 Catalin MarinasTrack the files conflict history
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-01-10 Catalin MarinasAdd option to automatically invoke the interactive...
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-01-10 Catalin MarinasAllow e-mail aliases for the "mail" command
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-01-10 Catalin MarinasIndent the example gitconfig file
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-01-10 Catalin MarinasPipe the 'patches --diff' output through the pager
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-01-04 Catalin MarinasFix the branch renaming to also rename the reflogs
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2007-01-04 Catalin MarinasAdd '--missing' option to 'series'
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
2006-12-13 Catalin MarinasFix the bash completion when there is no patch applied
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
 commit | commitdiff | tree
next
GIT patch-maintenance porcelain (local modifications)