Changes between Version 13 and Version 14 of GitCreateBundle


Ignore:
Timestamp:
Oct 24, 2013, 7:20:52 AM (11 years ago)
Author:
Piero Campalani
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • GitCreateBundle

    v13 v14  
    333333$ diff MERGE_FF.log MERGE.log
    3343341,2c1
    335 < commit fc2972dfe875a7d31ff80c065645dc13085a4468
    336 < Merge: c2aeb38 e5758d4
     335< commit <SHA-1 of M fast-forward>
     336< Merge: A D
    337337---
    338 > commit 4ebcf92bdf6e9c7bfa66c9c99ede2657c7b10d84
     338> commit <SHA-1 of M no-fast-forward>
    3393394c3
    340340< Date:   Wed Oct 23 17:24:04 2013 +0200
     
    344344
    345345
     346If only the hash tags of the commits and the dates differ, then youapplied exactly the same changes you made in your first merge.
     347
    346348== Further reading ==
    347349