git-imerge

mhagger/git-imerge

Fork 0

mirror of https://github.com/mhagger/git-imerge.git synced 2024-09-11 15:16:16 +03:00

Commit Graph

Author	SHA1	Message	Date
Paul Wise	b70eacc3d9	Update links from http to https Reduces the chance of network attackers modifying the HTML. Don't modify the embedded copy of the docutils small-white theme, since rebuilding the talk HTML will also revert the changes, if the theme is not yet present on disk. Suggested-by: check-all-the-things	2020-10-25 16:12:17 +08:00
Michael Haggerty	3bc89fb280	Fix the diagram for rebase-with-history. The "branch" reference should be moved, not the "master" reference. Reported-by: Christoffer Hammarström	2013-07-15 10:42:52 +02:00
Michael Haggerty	e7e4b9acee	Add the talk that I presented at GitMerge 2013.	2013-05-11 18:01:12 +02:00

Author

SHA1

Message

Date

Paul Wise

b70eacc3d9

Update links from http to https

Reduces the chance of network attackers modifying the HTML.

Don't modify the embedded copy of the docutils small-white theme,
since rebuilding the talk HTML will also revert the changes,
if the theme is not yet present on disk.

Suggested-by: check-all-the-things

2020-10-25 16:12:17 +08:00

Michael Haggerty

3bc89fb280

Fix the diagram for rebase-with-history.

The "branch" reference should be moved, not the "master" reference.

Reported-by: Christoffer Hammarström

2013-07-15 10:42:52 +02:00

Michael Haggerty

e7e4b9acee

Add the talk that I presented at GitMerge 2013.

2013-05-11 18:01:12 +02:00

3 Commits