LINUX.ORG.RU

История изменений

Исправление Dudraug, (текущая версия) : 

$ git log -p --graph
*   commit 37a2de6fb41e36d525940dd47f7395faeb5e518b
|\  Merge: 9942b9e d57cb66
| | Author: Dudraug
| | Date:   Sat Feb 8 01:23:23 2014 +0400
| |
| |     Merge branch 'test'
| |
| * commit d57cb6620713b91426eb2ba9def71938b7c5bfe1
| | Author: Dudraug
| | Date:   Sat Feb 8 01:15:22 2014 +0400
| |
| |     2+3=5
| |
| | diff --git a/1.txt b/1.txt
| | index 838c07f..8252a53 100644
| | --- a/1.txt
| | +++ b/1.txt
| | @@ -1,6 +1,6 @@
| |  +
| |  2
| |  and
| | -2
| | +3
| |  =
| | -4
| | +5
| |
* | commit 9942b9ecb5787dcab145ba306849291c6da1bf83
|/  Author: Dudraug
|   Date:   Sat Feb 8 01:16:15 2014 +0400
|
|       2*2=4
|
|   diff --git a/1.txt b/1.txt
|   index 838c07f..c93f470 100644
|   --- a/1.txt
|   +++ b/1.txt
|   @@ -1,4 +1,4 @@
|   -+
|   +*
|    2
|    and
|    2
|
* commit 3ea802f73438230185db1944f42ebeda7e527b85
  Author: Dudraug
  Date:   Sat Feb 8 01:13:41 2014 +0400

      2+2=4

  diff --git a/1.txt b/1.txt
  new file mode 100644
  index 0000000..838c07f
  --- /dev/null
  +++ b/1.txt
  @@ -0,0 +1,6 @@
  ++
  +2
  +and
  +2
  +=
  +4

Dudraug@Dudraug /usr/bin/test
$ cat 1.txt
*
2
and
3
=
5

$ git checkout test
Switched to branch 'test'

Dudraug@Dudraug /usr/bin/test
$ git log -p --graph
* commit d57cb6620713b91426eb2ba9def71938b7c5bfe1
| Author: Dudraug
| Date:   Sat Feb 8 01:15:22 2014 +0400
|
|     2+3=5
|
| diff --git a/1.txt b/1.txt
| index 838c07f..8252a53 100644
| --- a/1.txt
| +++ b/1.txt
| @@ -1,6 +1,6 @@
|  +
|  2
|  and
| -2
| +3
|  =
| -4
| +5
|
* commit 3ea802f73438230185db1944f42ebeda7e527b85
  Author: Dudraug
  Date:   Sat Feb 8 01:13:41 2014 +0400

      2+2=4

  diff --git a/1.txt b/1.txt
  new file mode 100644
  index 0000000..838c07f
  --- /dev/null
  +++ b/1.txt
  @@ -0,0 +1,6 @@
  ++
  +2
  +and
  +2
  +=
  +4

Dudraug@Dudraug /usr/bin/test
$ cat 1.txt
+
2
and
3
=
5

Исправление Dudraug, : 

$ git log -p --graph
*   commit 37a2de6fb41e36d525940dd47f7395faeb5e518b
|\  Merge: 9942b9e d57cb66
| | Author: Dudraug
| | Date:   Sat Feb 8 01:23:23 2014 +0400
| |
| |     Merge branch 'test'
| |
| * commit d57cb6620713b91426eb2ba9def71938b7c5bfe1
| | Author: U-Dudraug-ПК\Dudraug <Dudraug@Dudraug-<CF><CA>.(none)>
| | Date:   Sat Feb 8 01:15:22 2014 +0400
| |
| |     2+3=5
| |
| | diff --git a/1.txt b/1.txt
| | index 838c07f..8252a53 100644
| | --- a/1.txt
| | +++ b/1.txt
| | @@ -1,6 +1,6 @@
| |  +
| |  2
| |  and
| | -2
| | +3
| |  =
| | -4
| | +5
| |
* | commit 9942b9ecb5787dcab145ba306849291c6da1bf83
|/  Author: Dudraug
|   Date:   Sat Feb 8 01:16:15 2014 +0400
|
|       2*2=4
|
|   diff --git a/1.txt b/1.txt
|   index 838c07f..c93f470 100644
|   --- a/1.txt
|   +++ b/1.txt
|   @@ -1,4 +1,4 @@
|   -+
|   +*
|    2
|    and
|    2
|
* commit 3ea802f73438230185db1944f42ebeda7e527b85
  Author: Dudraug
  Date:   Sat Feb 8 01:13:41 2014 +0400

      2+2=4

  diff --git a/1.txt b/1.txt
  new file mode 100644
  index 0000000..838c07f
  --- /dev/null
  +++ b/1.txt
  @@ -0,0 +1,6 @@
  ++
  +2
  +and
  +2
  +=
  +4

Dudraug@Dudraug /usr/bin/test
$ cat 1.txt
*
2
and
3
=
5

$ git checkout test
Switched to branch 'test'

Dudraug@Dudraug /usr/bin/test
$ git log -p --graph
* commit d57cb6620713b91426eb2ba9def71938b7c5bfe1
| Author: Dudraug
| Date:   Sat Feb 8 01:15:22 2014 +0400
|
|     2+3=5
|
| diff --git a/1.txt b/1.txt
| index 838c07f..8252a53 100644
| --- a/1.txt
| +++ b/1.txt
| @@ -1,6 +1,6 @@
|  +
|  2
|  and
| -2
| +3
|  =
| -4
| +5
|
* commit 3ea802f73438230185db1944f42ebeda7e527b85
  Author: Dudraug
  Date:   Sat Feb 8 01:13:41 2014 +0400

      2+2=4

  diff --git a/1.txt b/1.txt
  new file mode 100644
  index 0000000..838c07f
  --- /dev/null
  +++ b/1.txt
  @@ -0,0 +1,6 @@
  ++
  +2
  +and
  +2
  +=
  +4

Dudraug@Dudraug /usr/bin/test
$ cat 1.txt
+
2
and
3
=
5

Исправление Dudraug, : 

$ git log -p --graph
*   commit 37a2de6fb41e36d525940dd47f7395faeb5e518b
|\  Merge: 9942b9e d57cb66
| | Author: U-Dudraug-ПК\Dudraug <Dudraug@Dudraug-<CF><CA>.(none)>
| | Date:   Sat Feb 8 01:23:23 2014 +0400
| |
| |     Merge branch 'test'
| |
| * commit d57cb6620713b91426eb2ba9def71938b7c5bfe1
| | Author: U-Dudraug-ПК\Dudraug <Dudraug@Dudraug-<CF><CA>.(none)>
| | Date:   Sat Feb 8 01:15:22 2014 +0400
| |
| |     2+3=5
| |
| | diff --git a/1.txt b/1.txt
| | index 838c07f..8252a53 100644
| | --- a/1.txt
| | +++ b/1.txt
| | @@ -1,6 +1,6 @@
| |  +
| |  2
| |  and
| | -2
| | +3
| |  =
| | -4
| | +5
| |
* | commit 9942b9ecb5787dcab145ba306849291c6da1bf83
|/  Author: U-Dudraug-ПК\Dudraug <Dudraug@Dudraug-<CF><CA>.(none)>
|   Date:   Sat Feb 8 01:16:15 2014 +0400
|
|       2*2=4
|
|   diff --git a/1.txt b/1.txt
|   index 838c07f..c93f470 100644
|   --- a/1.txt
|   +++ b/1.txt
|   @@ -1,4 +1,4 @@
|   -+
|   +*
|    2
|    and
|    2
|
* commit 3ea802f73438230185db1944f42ebeda7e527b85
  Author: U-Dudraug-ПК\Dudraug <Dudraug@Dudraug-<CF><CA>.(none)>
  Date:   Sat Feb 8 01:13:41 2014 +0400

      2+2=4

  diff --git a/1.txt b/1.txt
  new file mode 100644
  index 0000000..838c07f
  --- /dev/null
  +++ b/1.txt
  @@ -0,0 +1,6 @@
  ++
  +2
  +and
  +2
  +=
  +4

Dudraug@Dudraug-▒▒ /usr/bin/test
$ cat 1.txt
*
2
and
3
=
5

$ git checkout test
Switched to branch 'test'

Dudraug@Dudraug-▒▒ /usr/bin/test
$ git log -p --graph
* commit d57cb6620713b91426eb2ba9def71938b7c5bfe1
| Author: U-Dudraug-ПК\Dudraug <Dudraug@Dudraug-<CF><CA>.(none)>
| Date:   Sat Feb 8 01:15:22 2014 +0400
|
|     2+3=5
|
| diff --git a/1.txt b/1.txt
| index 838c07f..8252a53 100644
| --- a/1.txt
| +++ b/1.txt
| @@ -1,6 +1,6 @@
|  +
|  2
|  and
| -2
| +3
|  =
| -4
| +5
|
* commit 3ea802f73438230185db1944f42ebeda7e527b85
  Author: U-Dudraug-ПК\Dudraug <Dudraug@Dudraug-<CF><CA>.(none)>
  Date:   Sat Feb 8 01:13:41 2014 +0400

      2+2=4

  diff --git a/1.txt b/1.txt
  new file mode 100644
  index 0000000..838c07f
  --- /dev/null
  +++ b/1.txt
  @@ -0,0 +1,6 @@
  ++
  +2
  +and
  +2
  +=
  +4

Dudraug@Dudraug-▒▒ /usr/bin/test
$ cat 1.txt
+
2
and
3
=
5

Извиняюсь за сигвин=)

Исходная версия Dudraug, : 

$ git log -p --graph
*   commit 37a2de6fb41e36d525940dd47f7395faeb5e518b
|\  Merge: 9942b9e d57cb66
| | Author: U-Dudraug-ПК\Dudraug <Dudraug@Dudraug-<CF><CA>.(none)>
| | Date:   Sat Feb 8 01:23:23 2014 +0400
| |
| |     Merge branch 'test'
| |
| * commit d57cb6620713b91426eb2ba9def71938b7c5bfe1
| | Author: U-Dudraug-ПК\Dudraug <Dudraug@Dudraug-<CF><CA>.(none)>
| | Date:   Sat Feb 8 01:15:22 2014 +0400
| |
| |     2+3=5
| |
| | diff --git a/1.txt b/1.txt
| | index 838c07f..8252a53 100644
| | --- a/1.txt
| | +++ b/1.txt
| | @@ -1,6 +1,6 @@
| |  +
| |  2
| |  and
| | -2
| | +3
| |  =
| | -4
| | +5
| |
* | commit 9942b9ecb5787dcab145ba306849291c6da1bf83
|/  Author: U-Dudraug-ПК\Dudraug <Dudraug@Dudraug-<CF><CA>.(none)>
|   Date:   Sat Feb 8 01:16:15 2014 +0400
|
|       2*2=4
|
|   diff --git a/1.txt b/1.txt
|   index 838c07f..c93f470 100644
|   --- a/1.txt
|   +++ b/1.txt
|   @@ -1,4 +1,4 @@
|   -+
|   +*
|    2
|    and
|    2
|
* commit 3ea802f73438230185db1944f42ebeda7e527b85
  Author: U-Dudraug-ПК\Dudraug <Dudraug@Dudraug-<CF><CA>.(none)>
  Date:   Sat Feb 8 01:13:41 2014 +0400

      2+2=4

  diff --git a/1.txt b/1.txt
  new file mode 100644
  index 0000000..838c07f
  --- /dev/null
  +++ b/1.txt
  @@ -0,0 +1,6 @@
  ++
  +2
  +and
  +2
  +=
  +4

Dudraug@Dudraug-▒▒ /usr/bin/test
$ cat 1.txt
*
2
and
3
=
5

$ git checkout test
Switched to branch 'test'

Dudraug@Dudraug-▒▒ /usr/bin/test
$ git log -p --graph
* commit d57cb6620713b91426eb2ba9def71938b7c5bfe1
| Author: U-Dudraug-ПК\Dudraug <Dudraug@Dudraug-<CF><CA>.(none)>
| Date:   Sat Feb 8 01:15:22 2014 +0400
|
|     2+3=5
|
| diff --git a/1.txt b/1.txt
| index 838c07f..8252a53 100644
| --- a/1.txt
| +++ b/1.txt
| @@ -1,6 +1,6 @@
|  +
|  2
|  and
| -2
| +3
|  =
| -4
| +5
|
* commit 3ea802f73438230185db1944f42ebeda7e527b85
  Author: U-Dudraug-ПК\Dudraug <Dudraug@Dudraug-<CF><CA>.(none)>
  Date:   Sat Feb 8 01:13:41 2014 +0400

      2+2=4

  diff --git a/1.txt b/1.txt
  new file mode 100644
  index 0000000..838c07f
  --- /dev/null
  +++ b/1.txt
  @@ -0,0 +1,6 @@
  ++
  +2
  +and
  +2
  +=
  +4

Dudraug@Dudraug-▒▒ /usr/bin/test
$ cat 1.txt
+
2
and
3
=
5