Skip to content

Working with patches in Astroid

Gaute Hope edited this page Feb 24, 2017 · 10 revisions

Applying a single patch

  1. Open the message
  2. Press Y to yank the raw source of the message to the primary clipboard
  3. Open a terminal (or the drop-down terminal using |)
  4. Navigate to the repository
  5. Apply the patch using git am (or typically git am -3)
  6. Press Shift-Insert to paste the patch into stdin
  7. Press Ctrl-D to complete the paste

Applying a series of patches

  1. Open the thread
  2. Mark the messages containing patches using t (or T to mark all)
  3. Press ; to apply an action to all marked messages
  4. Press Y to create an mbox with a synthesis of the raw marked messages, this is stored on the clipboard
  5. Open a terminal (or the drop-down terminal using |)
  6. Navigate to the repository
  7. Apply the patch using git am (or typically git am -3)
  8. Press Shift-Insert to paste the patch into stdin
  9. Press Ctrl-D to complete the paste

Saving a series of patches for later merging

  1. Open the thread
  2. Mark the messages containing patches using t (or T to mark all)
  3. Press ; to apply an action to all marked messages
  4. Press s to save the marked messages individually to a desired directory
  5. Apply the patches using git am

Applying an inline diff

  1. Open the message
  2. Press y to yank the decoded message content to the primary clipboard
  3. Open a terminal (or the drop-down terminal using |)
  4. Navigate to the repository
  5. Apply the patch using git apply and Shift-Insert to paste the diff into stdin
  6. Press Ctrl-D to complete the paste

Sending a revised series using git-send-email

  1. Open the original series or the e-mail you wish to reply to
  2. Press Ctrl-y to yank the message-ID of the original message (this is now stored on the primary clipboard)
  3. Paste this to the --in-reply-to= command line option for git-send-email using Shift-Insert in your terminal.
Clone this wiki locally