Permalink
Browse files

next try to fix list in readme

  • Loading branch information...
simonthum committed May 20, 2012
1 parent 1e73801 commit e72bda7cc6e2c36d2dffe7a85cf39417521b2fcd
Showing with 16 additions and 6 deletions.
  1. +16 −6 README.md
View
@@ -48,17 +48,27 @@ course no guarantee can be given.
The flow is roughly:
1. sanity checks
- You don't want to do this in the middle of a rebase
+
+You don't want to do this in the middle of a rebase
+
2. Check for new files
- exit if there are, unless allowed in config
+
+exit if there are, unless allowed in config
+
2. check for auto-commitable changes
+
3. perform auto-commit
- one more check for leftover changes / general tidyness
+
+3. one more check for leftover changes / general tidyness
+
4. fetch upstream
+
5. Relate upstream to ours
- ahead -> push
- behind -> pull
- diverged -> rebase, then push
+
+ ahead -> push
+ behind -> pull
+ diverged -> rebase, then push
+
6. At exit, check sync state once more
On the first invocation, `git-sync` will ask you to whitelist the

0 comments on commit e72bda7

Please sign in to comment.