diff options
| -rw-r--r-- | samples/stg-lt-tools-documentation.txt | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/samples/stg-lt-tools-documentation.txt b/samples/stg-lt-tools-documentation.txt index 5e20e20..fca248c 100644 --- a/samples/stg-lt-tools-documentation.txt +++ b/samples/stg-lt-tools-documentation.txt @@ -1,10 +1,7 @@ LT Tools Documentation ====================== -2011-10-31 Andy Green <andy.green@linaro.org> -2011-10-21 Andy Green <andy.green@linaro.org> -2011-10-13 Andy Green <andy.green@linaro.org> -2011-09-08 Andy Green <andy.green@linaro.org> +2012-07-05 Andy Green <andy.green@linaro.org> What are these tools? @@ -120,12 +117,12 @@ commit. Notice you do not need to do the equivalent of git add, stgit finds the files you have edited itself. If you add a new file to the branch, you use -$ stg add <filepath> +$ git add <filepath> to add it to the current patch. You can see your stgit patchset on the current branch with -$ stg series +$ stg series (or, stg ser works too) Step 3: Import patch files @@ -137,6 +134,10 @@ will turn a patch file into an stgit patch. However it has some quirks, like getting confused by the additional From line found at the start of git-format-patch patches. +$ stg pick <hash> + +will import the patch represented by the given hash into an stg patch on top + $ stg-import-directory-cleanly.sh <directory> will import all the patches in the given directory working around the quirks. @@ -250,7 +251,7 @@ conflicts as being conflicted. The task then is to go through the conflicted files and fix up the <<<<<< ======= >>>>>>> in the usual way. When a file is fixed, you mark it as resolved -$ stg res <filepath> +$ git add <filepath> after the last file is resolved, you can do |