From 2b88ad2b5f53348421f5e826796de19c21b2dfb3 Mon Sep 17 00:00:00 2001 From: mihhalj Date: Wed, 29 Jan 2014 20:16:10 +0100 Subject: [PATCH 1/4] feature 1 --- test/file.one | 2 +- test/file.two | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 test/file.two diff --git a/test/file.one b/test/file.one index 07c88df..22bf7d1 100644 --- a/test/file.one +++ b/test/file.one @@ -1 +1 @@ -once upon a time there was git but without rebase +once upon a time there was git with rebase but how to use it? diff --git a/test/file.two b/test/file.two new file mode 100644 index 0000000..135cf15 --- /dev/null +++ b/test/file.two @@ -0,0 +1 @@ +feature file From eed6d235a708ba2c1f611d5a9fe7a9c8348b9a48 Mon Sep 17 00:00:00 2001 From: mihhalj Date: Wed, 29 Jan 2014 20:21:01 +0100 Subject: [PATCH 2/4] feature commit - new file --- test/file.one | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/file.one b/test/file.one index 22bf7d1..8a87a78 100644 --- a/test/file.one +++ b/test/file.one @@ -1 +1 @@ -once upon a time there was git with rebase but how to use it? +once upon a time there was git with rebase but how to use it - we want to find out From edfaf47b8b676df63eff36fd494a9429deb0219d Mon Sep 17 00:00:00 2001 From: mihhalj Date: Wed, 29 Jan 2014 20:27:11 +0100 Subject: [PATCH 3/4] feature commit - missed file --- test/file.four | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/file.four diff --git a/test/file.four b/test/file.four new file mode 100644 index 0000000..180b866 --- /dev/null +++ b/test/file.four @@ -0,0 +1 @@ +some nonconflicting message From 9f91c5c6ae4e349925c329ac29a0b51b658e1a4d Mon Sep 17 00:00:00 2001 From: mihhalj Date: Wed, 29 Jan 2014 20:17:59 +0100 Subject: [PATCH 4/4] another commit from master --- test/file.master.three | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/file.master.three diff --git a/test/file.master.three b/test/file.master.three new file mode 100644 index 0000000..b7b2287 --- /dev/null +++ b/test/file.master.three @@ -0,0 +1 @@ +some new file