From a1c6fbc1a65d8a755425d0b56077868148512891 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 24 Sep 2012 13:08:26 +0200 Subject: Initial README --- README | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 README diff --git a/README b/README new file mode 100644 index 000000000..211090809 --- /dev/null +++ b/README @@ -0,0 +1,19 @@ +ALSA branches +============= + +master - just stub with this text + +build - build code (not included to upstream, + can touch only alsa/ tree) +mirror - mirrored code (from upstream) +release - merged build & mirror trees for packaging + +Branch release +============== + +Please, use --log for the git merge command to show the "subject" of commits. +It might be handy to define these git aliases in your .git/config file: + +[alias] + bmerge = !git checkout release && git merge --log build + mmerge = !git checkout release && git merge --log mirror -- cgit 1.2.3-korg