Changes between Version 12 and Version 13 of GitCreateBundle

Timestamp:

Oct 24, 2013, 7:17:56 AM (11 years ago)

Author:

Piero Campalani

Comment:

add verification of merge

GitCreateBundle

@@ -264 +264 @@
 $ git format-patch HEAD~
 MERGE.patch
+# Save the log for final checks
+$ git log -1 master > MERGE_FF.log
 
 # Re-merge
@@ -324 +326 @@
 }}}
 
+Verify the operation:
+
+{{{
+#!sh
+$ git show M --stat > MERGE.log
+$ diff MERGE_FF.log MERGE.log
+1,2c1
+< commit fc2972dfe875a7d31ff80c065645dc13085a4468
+< Merge: c2aeb38 e5758d4
+---
+> commit 4ebcf92bdf6e9c7bfa66c9c99ede2657c7b10d84
+4c3
+< Date:   Wed Oct 23 17:24:04 2013 +0200
+---
+> Date:   Wed Oct 23 15:55:02 2013 +0200
+}}}
+
 
 == Further reading ==