summary refs log tree commit diff
path: root/docs/dev/git
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2020-05-14 18:03:10 +0100
committerGitHub <noreply@github.com>2020-05-14 18:03:10 +0100
commit66d03639dcc1d6b8cac849e334b17a7dbe558d18 (patch)
tree3fe534033c3cd89c5003b99a176400036b0d25b6 /docs/dev/git
parentUpdate reverse_proxy.md (diff)
downloadsynapse-66d03639dcc1d6b8cac849e334b17a7dbe558d18.tar.xz
Notes on using git (#7496)
* general updates to CONTRIBUTING.md
* notes on updating your PR
* Notes on squash-merging or otherwise
* document git branching model
Diffstat (limited to 'docs/dev/git')
-rw-r--r--docs/dev/git/branches.jpgbin0 -> 72228 bytes
-rw-r--r--docs/dev/git/clean.pngbin0 -> 110840 bytes
-rw-r--r--docs/dev/git/squash.pngbin0 -> 29667 bytes
3 files changed, 0 insertions, 0 deletions
diff --git a/docs/dev/git/branches.jpg b/docs/dev/git/branches.jpg
new file mode 100644
index 0000000000..715ecc8cd0
--- /dev/null
+++ b/docs/dev/git/branches.jpg
Binary files differdiff --git a/docs/dev/git/clean.png b/docs/dev/git/clean.png
new file mode 100644
index 0000000000..3accd7ccef
--- /dev/null
+++ b/docs/dev/git/clean.png
Binary files differdiff --git a/docs/dev/git/squash.png b/docs/dev/git/squash.png
new file mode 100644
index 0000000000..234caca3e4
--- /dev/null
+++ b/docs/dev/git/squash.png
Binary files differ