6 Commits

Author	SHA1	Message	Date
dannc	fc54720d4b	Merge branch 'git-merge' into main	2022-01-28 10:03:58 +07:00
dannc	4669b409b9	change rebase.sh	2022-01-28 09:48:49 +07:00
dannc	b305eaa877	merge: use shift	2022-01-28 09:47:41 +07:00
dannc	f767ec7e6a	merge: @ instead *	2022-01-28 09:46:48 +07:00
dannc	aa455677ef	prepare for merge and rebase	2022-01-28 09:45:20 +07:00
dannc	f176fb5cbc	add homework 2.3	2022-01-28 09:44:48 +07:00