28 reverting a

    29 % fold git patch into a regular patch, expect git patch

    30 popping git

    31 now at: regular

    32 diff --git a/a b/a

    33 --- a/a

    34 +++ b/a

    35 @@ -1,3 +1,4 @@

    36  a

    37  a

    38  b

    39 +a

    40 diff --git a/a b/aa

    41 copy from a

    42 copy to aa

    43 --- a/a

    44 +++ b/aa

    45 @@ -1,3 +1,4 @@

    46  a

    47  a

    48  b

    49 +a

    50 popping regular

    51 now at: p1

    52 % fold regular patch into a git patch, expect git patch

    53 popping regular

    54 now at: git

    55 diff --git a/a b/aa

    56 copy from a

    57 copy to aa

    58 --- a/a

    59 +++ b/aa

    60 @@ -1,3 +1,4 @@

    61  a

    62  a

    63  b

    64 +b