Changes between Version 13 and Version 14 of GitCreateBundle
- Timestamp:
- Oct 24, 2013, 7:20:52 AM (11 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
GitCreateBundle
v13 v14 333 333 $ diff MERGE_FF.log MERGE.log 334 334 1,2c1 335 < commit fc2972dfe875a7d31ff80c065645dc13085a4468336 < Merge: c2aeb38 e5758d4335 < commit <SHA-1 of M fast-forward> 336 < Merge: A D 337 337 --- 338 > commit 4ebcf92bdf6e9c7bfa66c9c99ede2657c7b10d84338 > commit <SHA-1 of M no-fast-forward> 339 339 4c3 340 340 < Date: Wed Oct 23 17:24:04 2013 +0200 … … 344 344 345 345 346 If only the hash tags of the commits and the dates differ, then youapplied exactly the same changes you made in your first merge. 347 346 348 == Further reading == 347 349