The Topic ranches you find in this GitSamples repo contains some hands on examples for simple git operations.
It shows the concept of GitSamples: Using git branches not only temporarily but as permanent space for scenarios with working examples in a certain environment with markdown documentation.
A space to experiment, document and share.
- automate-git: Aliases for simplify git shell work.
- github-readme-links: Examines the strange behaviour of markdown directory links in Github.
- switch-orphan-readme: How to create new topic branches with a "clean" history.
- merge-1B-into-1A: A merge from branch 1B into 1A with conflicts.
- merge-1B_1A-into-1A: A merge from branch 1B into 1A with no conflicts since 1A is in history.
- rebase-DCBA: How DCBA is created.
- rebase-FE: How FE is created.
- rebase-FEDCBA: How FEDCBA is created.
- rebase-1B_1A-onto-1A:
- rebase-interactive-FEDCBA-squashto-BA: interactiv with squash.
- patch-format-AB-patchA: Create a patch
- patch-apply-B-patchA: Apply the previous patch
There are several branches for other git operations. The following ones has a more
- cherrypick-FEDCBA-D-onto-A: A cherry-pick example
- diff-AB-A: A diff example
These branches contains one file containing simple characters which are used for the git samples in Topic Branches.
These branches contains only the file "file"
- 1A: File contains A in first line
- 1B: File contains B in first line
- 1B_1A: File contains B with A in history