aboutsummaryrefslogtreecommitdiffstats
path: root/stgit
AgeCommit message (Expand)AuthorFilesLines
2013-07-17Fix dirty index errors when resolving conflictsHEADmasterZane Bitter1-6/+7
2013-06-20stg: make refresh warn when index is dirtyJacob Keller1-0/+18
2013-05-29mail: don't hardcode space locations in template variablesJacob Keller1-19/+38
2013-04-29mail: Do no filter explicitly added --cc sender addressCatalin Marinas1-7/+5
2013-01-23uncommit: Prevent stack trace for uncommit --to a mergeJacob Keller1-9/+10
2013-01-08stgit: Add support for attaching patches and sending them inlinePeter P Waskiewicz Jr1-0/+4
2012-04-30stgit/git.py: Handle a reset that changes files to directoriesPeter Maydell1-1/+1
2012-04-18correct spelling error of accomodateDaniel Bergey1-1/+1
2012-04-18correct typo "allows to place"Daniel Bergey1-1/+1
2012-04-18Fix the 'status --reset' error messagesCatalin Marinas2-4/+4
2012-04-07branch: Add --merge flag when switching branchesGustav Hållberg1-2/+5
2012-04-07ignore error return from git show-ref when reading ref cacheGustav Hållberg1-1/+8
2012-02-15Parse commit object header correctlyJunio C Hamano1-14/+24
2012-01-18stg delete --topStepan Koltsov1-2/+12
2011-09-12Correct several transaction/log messagesNorbert Nemec3-3/+3
2011-09-12Replace the 'stg status' command with the 'git status -s' aliasCatalin Marinas2-111/+2
2011-09-12Allow 'stg reset --hard' to reset the changes in the worktreeCatalin Marinas1-12/+17
2011-09-08add fuzzy patch name lookup support for 'goto' commandLu Guanqun2-3/+18
2011-09-08add color to series commandLu Guanqun1-9/+37
2011-06-01Don't clear the list of changed patches when we hit a push conflictKarl Wiberg1-1/+0
2011-06-01reorder_patches: Comment that a failed push means we never get to the endKarl Wiberg1-0/+2
2011-06-01Correct function docstringKarl Wiberg1-1/+1
2011-06-01Diff several trees at once with git diff-tree --stdinKarl Wiberg1-4/+33
2011-02-14Remove the assert in CommitData.parse() functionCatalin Marinas1-2/+0
2010-11-24StGit: export: fix base commit reporting in series filePaulius Zaleckas1-1/+1
2010-10-22Add a branch --cleanup optionCatalin Marinas2-7/+42
2010-10-22Fix stg repair for hidden patchesJuergen Wieferink2-5/+17
2010-10-22Do not truncate the last word when creating patch namesCatalin Marinas1-1/+11
2010-10-22Allow uncommitting to a common ancestorCatalin Marinas1-0/+5
2010-10-22get_merge_bases() should return a list rather than setCatalin Marinas2-2/+2
2010-10-05Read several objects at once with git cat-file --batchKarl Wiberg2-2/+59
2010-05-24edit: Allow setting git tree of a patchGustav Hållberg1-11/+28
2010-05-24Repository.rev_parse: support commits, trees, and blobsGustav Hållberg1-4/+6
2010-05-15Restore the original applied patches during 'commit'Catalin Marinas1-2/+6
2010-03-29publish: Add '--last' option to show the last published patchCatalin Marinas1-2/+24
2010-03-26Strip leading or trailing '-' when generating patch namesCatalin Marinas1-1/+1
2010-03-25publish: Add the --unpublished options to list not yet published patchesCatalin Marinas2-6/+36
2010-03-24mail: Add 'snumber' template parameter equivalent to stripped 'number'Catalin Marinas1-0/+3
2010-03-22pick --revert wasn't using the correct authorCatalin Marinas1-3/+8
2010-03-09Allow interactive merging via StackTransaction.reorder_patches()Catalin Marinas3-4/+7
2010-03-01mail: Use space rather than tab for long subject header foldingCatalin Marinas1-0/+7
2010-02-15mail: Ask for the SMTP credentials before sending the messagesCatalin Marinas1-2/+20
2010-02-10Fix _command_list() function for empty command setsCatalin Marinas1-1/+4
2010-02-05Add support for command aliasesCatalin Marinas3-3/+46
2010-02-05Populate the cached config options with the defaultsCatalin Marinas1-14/+14
2010-02-05Pass the --in-reply-to and --no-thread options to git send-emailCatalin Marinas1-0/+4
2010-02-05Rename the mail --refid and --noreply options to match GitCatalin Marinas1-10/+10
2010-02-05Record a single transaction for conflicting push operationsCatalin Marinas1-19/+16
2010-02-05stg mail: don't parse To/Cc/Bcc in --git modeAlex Chiang1-9/+5
2010-02-05stg mail: add basic support for git send-emailAlex Chiang1-4/+46
2010-02-05stg mail: factor out __update_headerAlex Chiang1-23/+25
2010-02-05stg mail: make __send_message do moreAlex Chiang1-36/+29
2010-02-05stg mail: reorder __build_[message|cover] parametersAlex Chiang1-5/+5
2010-02-05stg mail: Refactor __send_message and friendsAlex Chiang1-24/+19
2010-01-31improve "usage" strings to include optional "--"Gustav Hållberg34-42/+42
2009-12-04new: Allow empty messages with --message and --fileGustav Hållberg1-2/+2
2009-10-28fold/import: Remove requirement on git 1.6.2Gustav Hållberg1-1/+1
2009-10-28push/pop: Allow "-n0" to do nothingGustav Hållberg2-4/+18
2009-10-24Slightly modify the "publish" command descriptionv0.15Catalin Marinas1-1/+1
2009-10-20Pick --revert option (formerly --reverse)Catalin Marinas1-5/+14
2009-10-19The '--file' option for 'new' should show 'FILE' rather than 'MESSAGE'Catalin Marinas1-0/+1
2009-10-18Do not use stdout instead of stderrCatalin Marinas1-3/+2
2009-10-17Ignore the git-config exit codeCatalin Marinas1-1/+2
2009-10-17Do not delete the builtin_version.py file after setupCatalin Marinas2-6/+1
2009-10-05Never skip rebaseJakob Stoklund Olesen1-3/+0
2009-09-30Fast-forward the published head when possibleCatalin Marinas1-0/+5
2009-09-30Delete the hidden patches as well when deleting a branchCatalin Marinas1-1/+2
2009-09-30Allow 'stg diff ..<commit>'Catalin Marinas1-1/+1
2009-09-30Allow importing of 'application/octet-stream' attachmentsCatalin Marinas1-1/+2
2009-09-16Autosign imported patchesCatalin Marinas1-2/+5
2009-09-16Add the -p option to foldCatalin Marinas1-2/+6
2009-09-16Do not create an empty patch if import failed without --rejectCatalin Marinas1-3/+8
2009-09-16Add the --reject option to foldCatalin Marinas1-4/+7
2009-09-16Remove the 'fail_dump' argument to git.apply_patch()Catalin Marinas1-9/+2
2009-09-13Generate binary diffs by defaultv0.15-rc3Catalin Marinas1-2/+5
2009-09-13Preserve the given author date during importCatalin Marinas1-0/+1
2009-09-08Add import -p optionCatalin Marinas2-6/+11
2009-09-08Merge commit 'kha/safe'Catalin Marinas1-1/+1
2009-09-03Escape patch name when creating regexpDavid Kågedal1-1/+1
2009-09-02Import git show output easilyCatalin Marinas1-2/+7
2009-08-24squash: Make commit message editing more convenientKarl Wiberg2-4/+17
2009-08-24When reading a config value, pick the last value, not the firstKarl Wiberg1-1/+1
2009-08-19Documentation: Rename remaining link macrosKarl Wiberg1-1/+1
2009-08-17Merge branch 'proposed' of git://github.com/gustavh/stgitKarl Wiberg3-5/+6
2009-08-13Add 'stg prev' and 'stg next'Hannes Eder2-0/+96
2009-08-13Re-send [StGit BUG/PATCH] config.py: fix unsetChris Packham1-2/+2
2009-08-13Work around performance bug in subprocess.Popen.communicate()Karl Wiberg1-1/+5
2009-08-13Reverse commit 9876a650 - return the first line from git describeCatalin Marinas2-2/+2
2009-08-03stgit new: Do not open editor if --save-template was specifiedGustav Hållberg3-5/+6
2009-07-31Only get the first line from 'git describe --all'Catalin Marinas1-1/+1
2009-07-31Improve the description/diff splitting when parsing patchesCatalin Marinas1-1/+1
2009-07-20Handle multi-line Subject header betterCatalin Marinas1-1/+2
2009-07-17fix "stg float -s FILE" for FILE != "-"Hannes Eder1-1/+2
2009-07-17Fix the import --url commandCatalin Marinas1-2/+2
2009-07-13Set the LESS environment if the pager is 'less'Catalin Marinas1-1/+2
2009-07-12Do not replace '-' with '.' in the version stringv0.15-rc1Catalin Marinas1-1/+1
2009-07-12Add --stat option to showCatalin Marinas1-1/+7
2009-07-10fix stg mail %(shortlog)s orderAlex Chiang1-1/+1
2009-07-10Add --reject option to importCatalin Marinas2-5/+10
2009-06-24Rename out.start() to out.inf() in the publish commandCatalin Marinas1-1/+1
2009-06-12Only allow publishing to refs/heads/*Catalin Marinas1-1/+6
2009-06-11Improve the "publish" merge message to give slightly more informationCatalin Marinas1-1/+2
2009-05-30Remove the resolved commandCatalin Marinas5-87/+4
2009-05-30Use the default git colouring scheme rather than specific scriptsCatalin Marinas4-5/+20
2009-05-30Add "stg id" support for "{public}" refCatalin Marinas4-15/+24
2009-05-30Add support for merge-friendly branchesCatalin Marinas4-21/+177
2009-05-29Pass "git config" flags in the right orderKarl Hasselström1-1/+1
2009-05-22Add a --set-tree flag to stg pushDavid Kågedal2-10/+47
2009-05-22Load the whole config at once and cache it for future useSamuel Tardieu1-14/+20
2009-05-22Transaction.push_patch(): Set self.head only when we have a merge conflictKarl Hasselström1-1/+7
2009-05-22Add the log --clear optionCatalin Marinas1-1/+8
2009-05-22Reinstate the --annotate option for refreshCatalin Marinas1-3/+10
2009-05-22Convert 'unhide' to the lib infrastructureCatalin Marinas1-18/+21
2009-05-22Convert 'hide' to the lib infrastructureCatalin Marinas1-18/+22
2009-05-22Convert 'clone' to the use stgit.libCatalin Marinas2-17/+15
2009-05-22Do not sleep after the last patch sent by e-mailCatalin Marinas1-6/+9
2009-05-22Show some progress information when checking for upstream merges.Catalin Marinas1-0/+2
2009-05-22Show "Pushing <patch>...done" when pushing a patchCatalin Marinas1-6/+7
2009-04-17Newer gits return 128 when git config --{rename,remove}-section failsKarl Hasselström1-2/+2
2009-04-09Convert "push" to the lib infrastructureCatalin Marinas1-32/+36
2009-04-09Convert "pop" to the lib infrastructureCatalin Marinas1-39/+28
2009-04-09Add the --merged option to gotoCatalin Marinas3-10/+49
2009-04-09Use a default "hidden" argument in StackTransaction.reorder_patchesCatalin Marinas3-6/+5
2009-04-09Convert "float" to the lib infrastructureCatalin Marinas1-53/+36
2009-04-09Convert "sink" to the new infrastructureCatalin Marinas1-48/+38
2009-04-09Add automatic git-mergetool invocation to the new infrastructureCatalin Marinas4-7/+23
2009-04-09Add mergetool support to the classic StGit infrastructureCatalin Marinas4-169/+18
2009-04-09Check for local changes with "goto"Catalin Marinas4-5/+31
2009-03-13Documentation: Rename link macrosKarl Hasselström5-9/+9
2009-03-13stg squash: Improve documentationKarl Hasselström1-4/+16
2009-02-26Rename "stg coalesce" to "stg squash"Karl Hasselström2-15/+15
2009-01-28Add --file option to pickCatalin Marinas1-2/+10
2009-01-28Merge branch 'stable'Catalin Marinas2-2/+4
2009-01-28Pass the diff flags when statistics are requiredCatalin Marinas3-10/+19
2009-01-23Make bash completion fail to bashdefault before default completion.Ted Pavlic1-1/+2
2009-01-23Modify bash completion to support help, version, and copyright.Ted Pavlic1-1/+7
2009-01-22Merge branch 'stable'Karl Hasselström2-2/+4
2009-01-14Fix the patch argument parsing for the "show" commandCatalin Marinas1-8/+8
2009-01-12stgit.namelength is an integerPete Wyckoff1-1/+1
2009-01-12Return None instead of crashing on undefined integer config itemsKarl Hasselström1-1/+3
2009-01-02Patch to clarify the "unsolved conflicts" message in Stacked GitJason Green1-2/+3
2009-01-01Merge branch 'proposed'Catalin Marinas2-8/+18
2008-12-29man pages: Bugfixed man pages for --sign and --ack flags; e.g., for stg-newGustav Hållberg1-1/+1
2008-12-21stg files: Don't write just an empty lineKarl Hasselström1-4/+7
2008-12-21stg mail: Improve error message for unknown sender identityGustav Hållberg1-2/+10
2008-12-21Add '--help' to tab completion for all commandsGustav Hållberg1-2/+5
2008-12-08stg series: Explain the list format betterKarl Hasselström1-5/+12
2008-12-08Use separate column for zero in output of stg series -eDavid Kågedal1-7/+10
2008-12-03Print conflict details with the new infrastructure (bug #11181)Catalin Marinas2-8/+18
2008-12-03fix export -sDan Williams1-0/+1
2008-12-03mail: add some commonly used tags to --autoDan Williams1-2/+11
2008-12-02Do not append a new line to the backwards compat files (bug #12656)Catalin Marinas1-1/+1
2008-11-29Fix the HEAD updating during a conflicting push (bug #12609)Catalin Marinas1-0/+1
2008-11-21Display (empty) when appropriate for the goto commandCatalin Marinas1-1/+3
2008-11-08Generate a different patch name if it already existsCatalin Marinas2-7/+18
2008-11-08Allow pick --fold to work without applied patchesCatalin Marinas1-1/+1
2008-11-08Remove e-mail address duplicatesCatalin Marinas2-43/+52
2008-11-08Remove the --committer optionsCatalin Marinas4-22/+6
2008-11-01Add parse_patches boundary in the delete.py fileCatalin Marinas1-1/+2
2008-11-01Change e-mail user agent header to StGitCatalin Marinas1-1/+1
2008-10-24Teach "stg import" to import patch series from tar archivesClark Williams1-2/+44
2008-10-19Fix "show" to allow multiple branch:patch argumentsCatalin Marinas1-2/+2
2008-10-05Refresh the main stg man pageKarl Hasselström1-1/+1
2008-10-02Use --diff rather than --patch in log.pyCatalin Marinas1-1/+1
2008-09-28Fix typoKarl Hasselström1-1/+1
2008-09-21Add a new flag, --spill, to stg deleteKarl Hasselström1-0/+13
2008-09-21Remove misleading "stg delete" documentationKarl Hasselström1-3/+1
2008-09-21Automatic bash completionKarl Hasselström43-53/+342
2008-09-21Implement "stg refresh --edit" againKarl Hasselström5-29/+58
2008-09-21Invoke the correct interactive editorKarl Hasselström1-9/+13
2008-09-21Refactor stgit.commands.editKarl Hasselström10-81/+130
2008-09-21Remove --undo flags from stg commands and docsKarl Hasselström7-96/+18
2008-09-21Convert "stg refresh" to the new infrastructureKarl Hasselström4-110/+268
2008-09-21Make "stg log" show stack log instead of patch logKarl Hasselström2-118/+48
2008-09-21Check for top == head at the start of every transactionKarl Hasselström5-7/+16
2008-09-21Log and undo external modificationsKarl Hasselström6-50/+96
2008-09-21New command: stg redoKarl Hasselström2-5/+70
2008-09-21New command: stg undoKarl Hasselström2-0/+85
2008-09-21Move stack reset function to a shared locationKarl Hasselström3-68/+75
2008-09-21Don't write a log entry if there were no changesKarl Hasselström2-5/+18
2008-09-21Add a --hard flag to stg resetKarl Hasselström3-8/+27
2008-09-21Log conflicts separately for all commandsKarl Hasselström2-1/+40
2008-09-21Log conflicts separatelyKarl Hasselström1-20/+37
2008-09-21New command: stg resetKarl Hasselström2-0/+134
2008-09-21Write to a stack log when stack is modifiedKarl Hasselström31-32/+388
2008-09-21Generate command lists automaticallyKarl Hasselström41-124/+122
2008-09-21asciidoc.conf: Steal updates from gitKarl Hasselström2-3/+3
2008-09-21Auto-generate man pages for all StGit commandsKarl Hasselström40-680/+763
2008-09-19Merge branch 'stable'Catalin Marinas1-7/+24
2008-09-18Fix the sink command for various test casesCatalin Marinas1-7/+24
2008-09-12Autosign newly created patchesCatalin Marinas1-1/+7
2008-09-12Do not crash if a patch log ref is missingCatalin Marinas1-1/+5
2008-09-09Merge branch 'stable'Catalin Marinas1-0/+4
2008-09-09Fix import to work properly in subdirectoriesCatalin Marinas1-0/+4
2008-09-09Fix the importing of config in series.pyCatalin Marinas1-0/+1
2008-09-06Refactoring: move shared options to their own moduleKarl Hasselström11-131/+128
2008-09-06Remove unneeded importKarl Hasselström1-2/+0
2008-08-27Remove dashed form of git command still in commentDaniel White1-1/+1
2008-08-27Merge branch 'stable'Karl Hasselström1-1/+1
2008-08-26Don't use the dashed for of git commandsKarl Hasselström7-7/+7