aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2018-11-21 15:03:27 +0000
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2018-11-21 15:03:27 +0000
commit3a28b5f1458289a51eed092638af7d69c432669f (patch)
treee16af548f98c8be7a6ba780f34bf5b0339a0f73a
parent4269bf721e626ae557959ed2b3e80e4cc59abf94 (diff)
Pulling into pipeline branch instead of fetching in README.md
In the previous commit, we were recommending to fetch the work from this pipeline. But since we have a separate `pipeline' branch, we can simply checkout to that branch and pull all the recent changes. So with this commit, the steps to get recent updates to the pipeline are updated.
-rw-r--r--README.md28
1 files changed, 15 insertions, 13 deletions
diff --git a/README.md b/README.md
index 00c3cd7..70ab8dd 100644
--- a/README.md
+++ b/README.md
@@ -624,21 +624,23 @@ advanced in later stages of your work.
below. In any case, please share your thoughts and suggestions with
us, so we can add them here for everyone's benefit.
- - **Keep pipeline up-to-date**: Thanks to your feedback and the feedback
- of other users, this pipeline is going to become more and more mature
- and robust. Bugs will be fixed and new/improved features will be
- added. So every once and a while, you can run the commands below to
- fetch new work that is done in this pipeline. If the changes are
- useful for your work, you can merge them with your own customized
- pipeline to benefit from them. Just pay **close attention** to
- resolving possible **conflicts** (updated general pipeline settings
- that you had customized) in the merge.
+ - **Keep pipeline up-to-date**: In time, this pipeline is going to become
+ more and more mature and robust (thanks to your feedback and the
+ feedback of other users). Bugs will be fixed and new/improved features
+ will be added. So every once and a while, you can run the commands
+ below to pull new work that is done in this pipeline. If the changes
+ are useful for your work, you can merge them with your own customized
+ pipeline to benefit from them. Just pay **very close attention** to
+ resolving possible **conflicts** which might happen in the merge
+ (updated general pipeline settings that you have customized).
```shell
- $ git fetch pipeline-origin # Get recent work in this pipeline.
- $ git log master..pipeline-origin/pipeline --reverse # Inspect new work.
- $ git checkout master # Go to top branch.
- $ git merge pipeline-origin/pipeline # Import all the work into master.
+ $ git checkout pipeline
+ $ git pull pipeline-origin pipeline # Get recent work in this pipeline.
+ $ git log XXXXXX..XXXXXX --reverse # Inspect new work (replace XXXXXXs with hashs mentioned in output of previous command).
+ $ git log --oneline --graph --decorate --all # General view of branches.
+ $ git checkout master # Go to your top working branch.
+ $ git merge pipeline # Import all the work into master.
```
- **Pre-publication: add notice on reproducibility**: Add a notice