Merge pull request #16 from fabiov/rebasing

#15 traduzione del capitolo Il Rebase
progit · Aug 16, 2021 · c6fd458 · c6fd458
2 parents 0f2ebc2 + 99c8ca2
commit c6fd458
Show file tree

Hide file tree

Showing 2 changed files with 102 additions and 98 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,7 @@ progit.mobi
 
 # vim objects
 *.swp
+
+# ide
+.idea
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,3 +11,7 @@ progit.mobi @@
     # vim objects
     *.swp
+    # ide
+    .idea