aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2013-07-17Fix dirty index errors when resolving conflictsHEADmasterZane Bitter1-6/+7
2013-06-27gitignore: Add ChangeLog to .gitignorev0.17Peter P Waskiewicz Jr1-0/+1
2013-06-27changelog: add new debian changelog entryPeter P Waskiewicz Jr1-0/+6
2013-06-20stg: make refresh warn when index is dirtyJacob Keller1-0/+18
2013-06-20stg: require python2 rather than generic python executableJacob Keller6-6/+6
2013-05-29AUTHORS: add PJ to authors filePeter P Waskiewicz Jr1-0/+1
2013-05-29mail: don't hardcode space locations in template variablesJacob Keller4-24/+43
2013-05-29templates: fix attach option to create a proper mbox formatPeter P Waskiewicz Jr1-0/+3
2013-05-29templates: fix attachinline option to generate proper mboxJesse Brandeburg1-0/+3
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 Jr2-0/+27
2012-12-05Include emacs and vim contribs in source tarballZane Bitter1-0/+3
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-18Regexen for macros to create links in html documentationDaniel Bergey1-0/+6
2012-04-18Fix the 'status --reset' error messagesCatalin Marinas2-4/+4
2012-04-18Remove setup.cfgCatalin Marinas2-3/+0
2012-04-10stgit.el: Make stgit-commit commit at most as many patches as are availableGustav Hållberg1-3/+4
2012-04-09stgit.el: Set file names when calling smerge-ediffGustav Hållberg1-1/+3
2012-04-09stgit.el: Handle file names that must be quotedGustav Hållberg1-8/+42
2012-04-09stgit.el: Stop stgit-rename from causing error on no changeGustav Hållberg1-11/+12
2012-04-09stgit.el: Use truenames when finding an already-existing stgit bufferGustav Hållberg1-2/+2
2012-04-09stgit.el: Fix bug when displaying non-stgit branchesGustav Hållberg1-4/+7
2012-04-09stgit.el: Catch errors in a better way in stgit-initGustav Hållberg1-3/+4
2012-04-09stgit.el: Make sure to set major mode in stgit-capture-outputGustav Hållberg1-0/+1
2012-04-09stgit.el: Change stgit-capture-output to return what its body returnedGustav Hållberg1-8/+9
2012-04-09stgit.el: Make \C-o create new patch at pointGustav Hållberg1-6/+46
2012-04-09stgit.el: Allow opening specific revisions of filesGustav Hållberg1-12/+40
2012-04-09stgit.el: Fix problems with revert of unmerged filesGustav Hållberg1-21/+56
2012-04-09stgit.el: Allow "U" to delete unknow/ignored files and directoriesGustav Hållberg1-19/+20
2012-04-09stgit.el: Add and use stgit-assert-no-unmerged-changesGustav Hållberg1-2/+9
2012-04-09stgit.el: Add and use stgit-save-excursionGustav Hållberg1-34/+109
2012-04-09stgit.el: Make "i" set mark correctly when working on the entire patchGustav Hållberg1-0/+4
2012-04-09stgit.el: Change return value of stgit-goto-patchGustav Hållberg1-18/+25
2012-04-09stgit.el: Refactor: rewrite stgit-define-toggle-viewGustav Hållberg1-11/+12
2012-04-07stgit.el: Show human-friendly message when {expand,collaps}ing patchesGustav Hållberg1-3/+8
2012-04-07stgit.el: Show human-friendly message when pressing =Gustav Hållberg1-49/+54
2012-04-07stgit.el: Add and use stgit-show-task-message to show messagesGustav Hållberg1-39/+51
2012-04-07stgit.el: Delay buffer reloads when setting customization variablesGustav Hållberg1-23/+35
2012-04-07stgit.el: Make stgit-previous-patch move to the current patch if on a patched...Gustav Hållberg1-0/+2
2012-04-07stgit.el: Unexpand all (normal) patches when switching branchesGustav Hållberg1-0/+6
2012-04-07stgit.el: Do not tab complete on current branch for stgit-branchGustav Hållberg1-5/+6
2012-04-07stgit.el: Make stgit-branch ask whether to merge uncommitted changesGustav Hållberg1-19/+36
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-04-06stgit.el: Make "\C-u !" run git even when no patches are selectedGustav Hållberg1-7/+6
2012-02-15Update the TODO fileCatalin Marinas1-14/+23
2012-02-15Parse commit object header correctlyJunio C Hamano1-14/+24
2012-01-18stg delete --topStepan Koltsov2-3/+25
2012-01-09Release 0.16v0.16Catalin Marinas2-50/+22
2012-01-09Add debian/changelog entry for the old 0.15 releaseCatalin Marinas1-0/+6
2012-01-09Fix the tutorial title markupCatalin Marinas1-1/+1
2011-09-12Correct several transaction/log messagesNorbert Nemec3-3/+3
2011-09-12Replace the 'stg status' command with the 'git status -s' aliasCatalin Marinas12-165/+41
2011-09-12Allow 'stg reset --hard' to reset the changes in the worktreeCatalin Marinas2-13/+18
2011-09-08remove obseleted TODO itemLu Guanqun1-1/+0
2011-09-08add fuzzy patch name lookup support for 'goto' commandLu Guanqun2-3/+18
2011-09-08add color to series commandLu Guanqun2-9/+44
2011-09-08fix typo in examples/gitconfigLu Guanqun1-1/+1
2011-06-01Don't clear the list of changed patches when we hit a push conflictKarl Wiberg2-2/+1
2011-06-01Add two tests (one currently failing) for "stg float" causing conflictsKarl Wiberg2-0/+80
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 Wiberg2-6/+36
2011-02-14Remove the assert in CommitData.parse() functionCatalin Marinas1-2/+0
2010-11-24contrib/vim: Add vim syntax highlighting for StGit commit messagesZane Bitter6-0/+196
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 Wieferink3-5/+60
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 Wiberg3-3/+62
2010-06-10tutorial: Very minor typo fixes in the Emacs sectionGustav Hållberg1-4/+4
2010-06-10stgit.el: Add stgit-{git,stg}-program variablesGustav Hållberg1-12/+25
2010-06-10stgit.el: Rearrange customizations a bitGustav Hållberg1-45/+50
2010-06-10stgit.el: Add "Customize StGit" menu entryGustav Hållberg1-0/+2
2010-06-10stgit.el: Improve how "t h" mode finds old commitsGustav Hållberg1-3/+4
2010-06-10stgit.el: Make C-{up,down} move between groups of patchesGustav Hållberg1-8/+85
2010-06-10stgit.el: Add a few links to some customization variablesGustav Hållberg1-0/+2
2010-06-10stgit.el: Repair ! for historical commitsGustav Hållberg1-10/+7
2010-06-10stgit.el: Honor stgit-find-copies-harder in stgit-diff-rangeGustav Hållberg1-4/+6
2010-06-10stgit.el: Honor stgit-find-copies-harder when showing entire patchesGustav Hållberg1-1/+2
2010-05-27stgit.el: Fix showing diff in file that has been both copied and modifiedGustav Hållberg1-0/+2
2010-05-24edit: Allow setting git tree of a patchGustav Hållberg2-11/+43
2010-05-24Repository.rev_parse: support commits, trees, and blobsGustav Hållberg1-4/+6
2010-05-15Restore the original applied patches during 'commit'Catalin Marinas2-2/+27
2010-05-05Merge remote branch 'gustav/proposed'Karl Wiberg2-171/+444
2010-04-30stgit.el: Make ! with prefix argument prompt for git commandGustav Hållberg1-4/+8
2010-04-30stgit.el: Make ! sort patches when building command lineGustav Hållberg1-1/+2
2010-04-30stgit.el: Add visual feedback (a message) when toggling view flagsGustav Hållberg1-8/+25
2010-04-30stgit.el: Add stgit-inhibit-messagesGustav Hållberg1-11/+21
2010-04-30stgit.el: Add support for showing git-svn informationGustav Hållberg1-11/+64
2010-04-30stgit.el: Remove useless defvarsGustav Hållberg1-3/+0
2010-04-30stgit.el: Use forward-line instead of goto-line non-interactivelyGustav Hållberg1-1/+3
2010-04-30stgit.el: Make stgit-toggle-* behave as documentedGustav Hållberg1-36/+24
2010-04-30stgit.el: Make "C-u r" raise error if run with prefix argument without a patchGustav Hållberg1-1/+1
2010-04-30stgit.el: Make stgit-reload move point more intuitively when a patch disappearsGustav Hållberg1-4/+5
2010-04-30stgit.el: Allow showing recent historical (committed) commits as wellGustav Hållberg2-70/+177
2010-04-30stgit.el: Add stgit-line-formatGustav Hållberg1-3/+8
2010-04-30stgit.el: Minor improvements of stgit{,-noname}-patch-line-format documentationGustav Hållberg1-4/+4
2010-04-30stgit.el: Delay automatic refresh of stgit buffers a bitGustav Hållberg1-6/+40
2010-04-30stgit.el: Refresh stgit buffer after dired-delete-fileGustav Hållberg1-2/+4
2010-04-30stgit.el: Refactor: use mapc to set all local variables in stgit-modeGustav Hållberg1-11/+11
2010-04-30stgit.el: Add stgit-default-show-{ignored,unknown}Gustav Hållberg1-4/+28
2010-04-30stgit.el: Fix so "t u" and "t i" only operate on the current bufferGustav Hållberg1-6/+10
2010-04-30stgit.el: Move to goal column after expanding unknown directoryGustav Hållberg1-0/+2
2010-04-30stgit.el: Ask for branch point when creating new branchGustav Hållberg1-3/+10
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-24stgit.el: Use comint-carriage-motion in output from "!"Gustav Hållberg1-0/+17
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-26stgit.el: Do not use suppress-keymap for prefix keymapsGustav Hållberg1-2/+0
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-05Replace some git commands with stg aliases in test scriptsCatalin Marinas48-110/+110
2010-02-05Add support for command aliasesCatalin Marinas4-3/+50
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 Marinas3-22/+19
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-02-03stgit.el: Add the stgit-execute command and bind it to "!"David Kågedal1-1/+57
2010-01-31improve "usage" strings to include optional "--"Gustav Hållberg34-42/+42
2010-01-29stgit.el: Handle patch and branch names starting with hyphenGustav Hållberg1-12/+13
2010-01-29stgit.el: Made a few wide lines more narrowGustav Hållberg1-2/+5
2010-01-25stgit.el: Run "git update-index --refresh" before redrawing work tree statusGustav Hållberg1-0/+2
2010-01-22stgit.el: Advise non-stgit git functions to update stgit buffersGustav Hållberg1-7/+46
2010-01-22Tutorial: Add stgit.el sectionGustav Hållberg1-0/+203
2010-01-22stgit.el: Prevent stgit-applied-patches from moving pointGustav Hållberg1-2/+4
2010-01-22stgit.el: Annotate stgit-capture-output macro for edebugGustav Hållberg1-0/+2
2010-01-22stgit.el: Add command for showing diff for a range of patchesKarl Wiberg1-0/+33
2010-01-22stgit.el: Optionally allow duplicates when sorting patchesKarl Wiberg1-4/+6
2010-01-22stgit.el: Break out diff whitespace arg handling to separate functionKarl Wiberg1-5/+6
2010-01-22Merge gustav/proposedKarl Wiberg1-16/+44
2009-12-17Merge branch 'stable'Catalin Marinas1-1/+1
2009-12-17Fix "stg applied" usage in contrib/stg-dispatchCatalin Marinas1-1/+1
2009-12-16stgit.el: Make "G" work before/after the treeGustav Hållberg1-14/+40
2009-12-06stgit.el: Repair how patches with empty descriptions are shownGustav Hållberg1-2/+4
2009-12-04stgit.el: Do not emit trailing whitespaceGustav Hållberg1-3/+12
2009-12-04stgit.el: Get default rebase branch from git-config in stg-rebaseGustav Hållberg1-2/+17
2009-12-04stgit.el: Allow "B" to create new branchesGustav Hållberg1-13/+37
2009-12-04stgit.el: Make stg undo/redo --hard ask for confirmation with dirty index/wor...Gustav Hållberg1-12/+18
2009-12-04stgit.el: Do not recurse into unknown directories after "t u"Gustav Hållberg1-40/+85
2009-12-04stgit.el: Use "->" for defstruct field accessorsGustav Hållberg1-61/+63
2009-12-04stgit.el: Disable undo information in stgit output capture buffersGustav Hållberg1-0/+1
2009-12-04new: Allow empty messages with --message and --fileGustav Hållberg1-2/+2
2009-12-04stgit.el: Make the patch name optionalDavid Kågedal1-4/+58
2009-12-04stgit.el: Use format-spec when formatting file informationDavid Kågedal1-25/+37
2009-12-04stgit.el: Use format-spec when formatting patch linesDavid Kågedal1-20/+44
2009-12-04stgit.el: Move defcustom definitions to the topDavid Kågedal1-120/+120
2009-12-03Merge commit 'kha/safe'Catalin Marinas1-5/+9
2009-12-03Merge branch 'stable'Catalin Marinas1-10/+2
2009-12-03Update the tutorial for the conflict situationsCatalin Marinas1-10/+2
2009-11-23undo: Add test that "stg undo --hard" leaves the stgit tree in a consistent s...Gustav Hållberg1-5/+9
2009-10-28Merge branch 'stable'Catalin Marinas3-19/+21
2009-10-28Fix setup.py to generate the needed filesCatalin Marinas3-19/+21
2009-10-28stgit.el: Position point at beginning of buffer before editing messagesGustav Hållberg1-3/+5
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ållberg4-37/+100
2009-10-28stgit.el: Improve help text on stgit-gotoGustav Hållberg1-1/+3
2009-10-24Slightly modify the "publish" command descriptionv0.15Catalin Marinas1-1/+1
2009-10-20Pick --revert option (formerly --reverse)Catalin Marinas2-7/+16
2009-10-19The '--file' option for 'new' should show 'FILE' rather than 'MESSAGE'Catalin Marinas1-0/+1
2009-10-18Update the RELEASENOTES file with latest changesv0.15-rc4Catalin Marinas1-3/+9
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 Marinas3-11/+3
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 Marinas5-6/+61
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-09-02Merge commit 'kha/safe'Catalin Marinas3-5/+18
2009-09-02Add stg-build, stg-dbg and RELEASENOTES to the MANIFEST.in fileCatalin Marinas1-0/+3
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-21Add the next/prev commands to the RELEASENOTES filev0.15-rc2Catalin Marinas1-0/+3