summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Beckert <abe@deuxchevaux.org>2014-10-08 21:54:20 +0200
committerAxel Beckert <abe@deuxchevaux.org>2014-10-08 21:54:20 +0200
commit803d6815e83e93d73293341a00d05d5056de0875 (patch)
tree8e4302e7315f29f3ea8182da3fc118e951b32457
parent290eaa0535a084020587fdbb2bb74930c242395b (diff)
downloadzsh-803d6815e83e93d73293341a00d05d5056de0875.tar.gz
zsh-803d6815e83e93d73293341a00d05d5056de0875.zip
Workflow: Move "Keeping the local repository clean" to the end under "General Git Hints"
-rw-r--r--debian/pkg-zsh-workflow.md31
1 files changed, 17 insertions, 14 deletions
diff --git a/debian/pkg-zsh-workflow.md b/debian/pkg-zsh-workflow.md
index 970480ec2..5aebf1ef2 100644
--- a/debian/pkg-zsh-workflow.md
+++ b/debian/pkg-zsh-workflow.md
@@ -183,20 +183,6 @@ script file. There are a few things to keep in mind:
suggest how to commit the newly intoduced patch. Season to taste.
-#### Keeping the local repository clean
-
-Before making changes of any kind, it should be made sure that the
-local repository you are working on is in a clean state. To clean up
-the local repository do this:
-
- % git clean -xdf
- % git reset --hard
-
-That will make sure that any non-tracked files are removed and that
-any changes in tracked files are reverted. The latter will also make
-sure that no parts of a quilt patch-queue are still applied.
-
-
### Releases
When a change justifies the release of a new package version, the
@@ -470,3 +456,20 @@ Now git will ignore quilt's directory for this repository.
Unfortunately, this has to be done for each checkout. Luckily, this
only has an impact for people who want to work on 'pkg-zsh'. Everyone
else can savely ignore the directory.
+
+
+General Git Hints
+-----------------
+
+### Keeping the local repository clean
+
+Before making changes of any kind, it should be made sure that the
+local repository you are working on is in a clean state. To clean up
+the local repository do this:
+
+ % git clean -xdf
+ % git reset --hard
+
+That will make sure that any non-tracked files are removed and that
+any changes in tracked files are reverted. The latter will also make
+sure that no parts of a quilt patch-queue are still applied.