bloc 5: squash ps1

joapuiib · Oct 17, 2024 · 3f116c2 · 3f116c2
1 parent 9ea5a3b
commit 3f116c2
Show file tree

Hide file tree

Showing 32 changed files with 253 additions and 240 deletions.
diff --git a/docs/files/estrategies/estrategies.py b/docs/files/estrategies/estrategies.py
@@ -63,21 +63,22 @@ def set_user(self, user):
 
     def get_git_branch(self):
         try:
+            git_tools_path = os.path.expanduser("~/usr/bin/git-prompt.sh")
             branch = subprocess.check_output(
-                ["git", "symbolic-ref", "--short", "HEAD"],
+                ["bash", "-c", f"source {git_tools_path} && __git_ps1"],
                 stderr=subprocess.DEVNULL,
                 text=True
             ).strip()
             return branch
-        except subprocess.CalledProcessError:
+        except subprocess.CalledProcessError as e:
             return ""
 
 
     def build_prompt(self):
         prompt = f"{self.user}@{self.host}:{self.workdir}"
         branch = self.get_git_branch()
         if branch:
-            prompt += f" ({branch})"
+            prompt += f" {branch}"
         prompt += " $"
         prompt = prompt.replace(self.home_dir, "~")
         return prompt

diff --git a/docs/files/estrategies/stdout/branques.txt b/docs/files/estrategies/stdout/branques.txt
@@ -1,13 +1,13 @@
 jpuigcerver@fp:~/gitflow $ cd ~/gitflow/remot
 jpuigcerver@fp:~/gitflow/remot (main) $ git lga
-* 6a65cbc - (0 seconds ago) Autors: Mar - Mar (feature/author)
-* 41f9bfe - (0 seconds ago) Autors: Pau - Mar
-* 36c37ef - (0 seconds ago) Autors: Anna - Mar
-* 4b4163e - (0 seconds ago) README.md: Secció d'autors - Mar
-| * c424285 - (0 seconds ago) LICENSE: Enllaç a la llicència - Pau (feature/license)
-| * 2da5ca1 - (0 seconds ago) LICENSE: Afegida llicència - Pau
+* a216550 - (0 seconds ago) Autors: Mar - Mar (feature/author)
+* 1d5ba44 - (0 seconds ago) Autors: Pau - Mar
+* 8683319 - (0 seconds ago) Autors: Anna - Mar
+* 24be503 - (0 seconds ago) README.md: Secció d'autors - Mar
+| * c213387 - (0 seconds ago) LICENSE: Enllaç a la llicència - Pau (feature/license)
+| * b11b498 - (0 seconds ago) LICENSE: Afegida llicència - Pau
 |/  
-| * 60e7175 - (0 seconds ago) README.md: Branques propòsit únic - Anna (feature/readme)
-| * a32d18d - (0 seconds ago) README.md: Descripció - Anna
+| * ea2559a - (1 second ago) README.md: Branques propòsit únic - Anna (feature/readme)
+| * 502dadb - (1 second ago) README.md: Descripció - Anna
 |/  
-* b11655b - (1 second ago) Commit inicial - Joan Puigcerver (HEAD -> main, develop)
+* ec0e2bd - (1 second ago) Commit inicial - Joan Puigcerver (HEAD -> main, develop)
diff --git a/docs/files/estrategies/stdout/clone.txt b/docs/files/estrategies/stdout/clone.txt
@@ -12,4 +12,16 @@ jpuigcerver@fp:~/gitflow $ git clone remot carles
 Cloning into 'carles'...
 done.
 jpuigcerver@fp:~/gitflow $ tree .
-/bin/bash: line 1: tree: command not found
+.
+├── anna
+│   └── README.md
+├── carles
+│   └── README.md
+├── mar
+│   └── README.md
+├── pau
+│   └── README.md
+└── remot
+    └── README.md
+
+6 directories, 5 files
diff --git a/docs/files/estrategies/stdout/development.txt b/docs/files/estrategies/stdout/development.txt
@@ -1,3 +1,3 @@
 jpuigcerver@fp:~/gitflow/remot (main) $ git branch develop
 jpuigcerver@fp:~/gitflow/remot (main) $ git lga
-* b11655b - (1 second ago) Commit inicial - Joan Puigcerver (HEAD -> main, develop)
+* ec0e2bd - (0 seconds ago) Commit inicial - Joan Puigcerver (HEAD -> main, develop)
diff --git a/docs/files/estrategies/stdout/feature_author.txt b/docs/files/estrategies/stdout/feature_author.txt
@@ -2,34 +2,34 @@ mar@fp:~/gitflow $ cd ~/gitflow/mar
 mar@fp:~/gitflow/mar (main) $ git config user.name "Mar"
 mar@fp:~/gitflow/mar (main) $ git config user.email "[email protected]"
 mar@fp:~/gitflow/mar (main) $ git checkout develop
-Branch 'develop' set up to track remote branch 'develop' from 'origin'.
+branch 'develop' set up to track 'origin/develop'.
 Switched to a new branch 'develop'
 mar@fp:~/gitflow/mar (develop) $ git checkout -b feature/author
 Switched to a new branch 'feature/author'
 mar@fp:~/gitflow/mar (feature/author) $ echo "" >> README.md
 mar@fp:~/gitflow/mar (feature/author) $ echo "## Autors" >> README.md
 mar@fp:~/gitflow/mar (feature/author) $ git commit -a -m "README.md: Secció d'autors"
-[feature/author 4b4163e] README.md: Secció d'autors
+[feature/author 24be503] README.md: Secció d'autors
  1 file changed, 2 insertions(+)
 mar@fp:~/gitflow/mar (feature/author) $ echo "- Anna ([email protected])" >> README.md
 mar@fp:~/gitflow/mar (feature/author) $ git commit -a -m "Autors: Anna"
-[feature/author 36c37ef] Autors: Anna
+[feature/author 8683319] Autors: Anna
  1 file changed, 1 insertion(+)
 mar@fp:~/gitflow/mar (feature/author) $ echo "- Pau ([email protected])" >> README.md
 mar@fp:~/gitflow/mar (feature/author) $ git commit -a -m "Autors: Pau"
-[feature/author 41f9bfe] Autors: Pau
+[feature/author 1d5ba44] Autors: Pau
  1 file changed, 1 insertion(+)
 mar@fp:~/gitflow/mar (feature/author) $ echo "- Mar ([email protected])" >> README.md
 mar@fp:~/gitflow/mar (feature/author) $ git commit -a -m "Autors: Mar"
-[feature/author 6a65cbc] Autors: Mar
+[feature/author a216550] Autors: Mar
  1 file changed, 1 insertion(+)
 mar@fp:~/gitflow/mar (feature/author) $ git push -u origin feature/author
-Branch 'feature/author' set up to track remote branch 'feature/author' from 'origin'.
+branch 'feature/author' set up to track 'origin/feature/author'.
 To ~/gitflow/remot
  * [new branch]      feature/author -> feature/author
 mar@fp:~/gitflow/mar (feature/author) $ git lga
-* 6a65cbc - (0 seconds ago) Autors: Mar - Mar (HEAD -> feature/author, origin/feature/author)
-* 41f9bfe - (0 seconds ago) Autors: Pau - Mar
-* 36c37ef - (0 seconds ago) Autors: Anna - Mar
-* 4b4163e - (0 seconds ago) README.md: Secció d'autors - Mar
-* b11655b - (1 second ago) Commit inicial - Joan Puigcerver (origin/main, origin/develop, origin/HEAD, main, develop)
+* a216550 - (0 seconds ago) Autors: Mar - Mar (HEAD -> feature/author, origin/feature/author)
+* 1d5ba44 - (0 seconds ago) Autors: Pau - Mar
+* 8683319 - (0 seconds ago) Autors: Anna - Mar
+* 24be503 - (0 seconds ago) README.md: Secció d'autors - Mar
+* ec0e2bd - (1 second ago) Commit inicial - Joan Puigcerver (origin/main, origin/develop, origin/HEAD, main, develop)
diff --git a/docs/files/estrategies/stdout/feature_author_delete.txt b/docs/files/estrategies/stdout/feature_author_delete.txt
@@ -1,10 +1,10 @@
 mar@fp:~/gitflow/mar (develop) $ git branch -D feature/author
-Deleted branch feature/author (was 2d65a0b).
+Deleted branch feature/author (was 72afb5a).
 mar@fp:~/gitflow/mar (develop) $ git push origin --delete feature/author
 To ~/gitflow/remot
  - [deleted]         feature/author
 mar@fp:~/gitflow/mar (develop) $ git lga
-* 21278b3 - (0 seconds ago) Merge branch 'feature/author' - Mar (HEAD -> develop, origin/develop)
-* 26e4b55 - (0 seconds ago) Merge branch 'feature/license' - Pau
-* 2241b23 - (1 second ago) Merge branch 'feature/readme' - Anna
-* b11655b - (2 seconds ago) Commit inicial - Joan Puigcerver (origin/main, origin/HEAD, main)
+* f9152dc - (0 seconds ago) Merge branch 'feature/author' - Mar (HEAD -> develop, origin/develop)
+* b7bf0a5 - (1 second ago) Merge branch 'feature/license' - Pau
+* 2bc4029 - (2 seconds ago) Merge branch 'feature/readme' - Anna
+* ec0e2bd - (4 seconds ago) Commit inicial - Joan Puigcerver (origin/main, origin/HEAD, main)
diff --git a/docs/files/estrategies/stdout/feature_author_fetch.txt b/docs/files/estrategies/stdout/feature_author_fetch.txt
@@ -1,13 +1,13 @@
 mar@fp:~/gitflow $ cd ~/gitflow/mar
 mar@fp:~/gitflow/mar (feature/author) $ git fetch
 From ~/gitflow/remot
-   b11655b..26e4b55  develop    -> origin/develop
+   ec0e2bd..b7bf0a5  develop    -> origin/develop
 mar@fp:~/gitflow/mar (feature/author) $ git lga
-* 26e4b55 - (0 seconds ago) Merge branch 'feature/license' - Pau (origin/develop)
-* 2241b23 - (1 second ago) Merge branch 'feature/readme' - Anna
-| * 6a65cbc - (1 second ago) Autors: Mar - Mar (HEAD -> feature/author, origin/feature/author)
-| * 41f9bfe - (1 second ago) Autors: Pau - Mar
-| * 36c37ef - (1 second ago) Autors: Anna - Mar
-| * 4b4163e - (1 second ago) README.md: Secció d'autors - Mar
+* b7bf0a5 - (0 seconds ago) Merge branch 'feature/license' - Pau (origin/develop)
+* 2bc4029 - (1 second ago) Merge branch 'feature/readme' - Anna
+| * a216550 - (2 seconds ago) Autors: Mar - Mar (HEAD -> feature/author, origin/feature/author)
+| * 1d5ba44 - (2 seconds ago) Autors: Pau - Mar
+| * 8683319 - (2 seconds ago) Autors: Anna - Mar
+| * 24be503 - (2 seconds ago) README.md: Secció d'autors - Mar
 |/  
-* b11655b - (2 seconds ago) Commit inicial - Joan Puigcerver (origin/main, origin/HEAD, main, develop)
+* ec0e2bd - (3 seconds ago) Commit inicial - Joan Puigcerver (origin/main, origin/HEAD, main, develop)
diff --git a/docs/files/estrategies/stdout/feature_author_merge.txt b/docs/files/estrategies/stdout/feature_author_merge.txt
@@ -5,18 +5,18 @@ mar@fp:~/gitflow/mar (feature/author) $ git merge --no-ff --no-edit develop # (1
 Auto-merging README.md
 CONFLICT (content): Merge conflict in README.md
 Automatic merge failed; fix conflicts and then commit the result.
-mar@fp:~/gitflow/mar (feature/author) $ vim README.md # (2)!
-mar@fp:~/gitflow/mar (feature/author) $ git add README.md
-mar@fp:~/gitflow/mar (feature/author) $ git commit --no-edit # (1)!
-[feature/author 2d65a0b] Merge branch 'develop' into feature/author
+mar@fp:~/gitflow/mar (feature/author|MERGING) $ vim README.md # (2)!
+mar@fp:~/gitflow/mar (feature/author|MERGING) $ git add README.md
+mar@fp:~/gitflow/mar (feature/author|MERGING) $ git commit --no-edit # (1)!
+[feature/author 72afb5a] Merge branch 'develop' into feature/author
 mar@fp:~/gitflow/mar (feature/author) $ git lga
-*   2d65a0b - (0 seconds ago) Merge branch 'develop' into feature/author - Mar (HEAD -> feature/author)
+*   72afb5a - (0 seconds ago) Merge branch 'develop' into feature/author - Mar (HEAD -> feature/author)
 |\  
-| * 26e4b55 - (0 seconds ago) Merge branch 'feature/license' - Pau (origin/develop, develop)
-| * 2241b23 - (1 second ago) Merge branch 'feature/readme' - Anna
-* | 6a65cbc - (1 second ago) Autors: Mar - Mar (origin/feature/author)
-* | 41f9bfe - (1 second ago) Autors: Pau - Mar
-* | 36c37ef - (1 second ago) Autors: Anna - Mar
-* | 4b4163e - (1 second ago) README.md: Secció d'autors - Mar
+| * b7bf0a5 - (1 second ago) Merge branch 'feature/license' - Pau (origin/develop, develop)
+| * 2bc4029 - (2 seconds ago) Merge branch 'feature/readme' - Anna
+* | a216550 - (3 seconds ago) Autors: Mar - Mar (origin/feature/author)
+* | 1d5ba44 - (3 seconds ago) Autors: Pau - Mar
+* | 8683319 - (3 seconds ago) Autors: Anna - Mar
+* | 24be503 - (3 seconds ago) README.md: Secció d'autors - Mar
 |/  
-* b11655b - (2 seconds ago) Commit inicial - Joan Puigcerver (origin/main, origin/HEAD, main)
+* ec0e2bd - (4 seconds ago) Commit inicial - Joan Puigcerver (origin/main, origin/HEAD, main)
diff --git a/docs/files/estrategies/stdout/feature_author_merge_squash.txt b/docs/files/estrategies/stdout/feature_author_merge_squash.txt
@@ -2,7 +2,7 @@ mar@fp:~/gitflow/mar (feature/author) $ git checkout develop
 Your branch is up to date with 'origin/develop'.
 Switched to branch 'develop'
 mar@fp:~/gitflow/mar (develop) $ git merge --squash feature/author
-Updating 26e4b55..2d65a0b
+Updating b7bf0a5..72afb5a
 Fast-forward
 Squash commit -- not updating HEAD
  README.md | 5 +++++
@@ -31,19 +31,19 @@ index 9e7f142..416ca41 100644
  marc de treball organitzat que facilita la col·laboració
  entre diferents desenvolupadors en un mateix projecte
 mar@fp:~/gitflow/mar (develop) $ git commit -m "Merge branch 'feature/author'"
-[develop 21278b3] Merge branch 'feature/author'
+[develop f9152dc] Merge branch 'feature/author'
  1 file changed, 5 insertions(+)
 mar@fp:~/gitflow/mar (develop) $ git lga
-* 21278b3 - (0 seconds ago) Merge branch 'feature/author' - Mar (HEAD -> develop)
-| *   2d65a0b - (0 seconds ago) Merge branch 'develop' into feature/author - Mar (feature/author)
+* f9152dc - (0 seconds ago) Merge branch 'feature/author' - Mar (HEAD -> develop)
+| *   72afb5a - (0 seconds ago) Merge branch 'develop' into feature/author - Mar (feature/author)
 | |\  
 | |/  
 |/|   
-* | 26e4b55 - (0 seconds ago) Merge branch 'feature/license' - Pau (origin/develop)
-* | 2241b23 - (1 second ago) Merge branch 'feature/readme' - Anna
-| * 6a65cbc - (1 second ago) Autors: Mar - Mar (origin/feature/author)
-| * 41f9bfe - (1 second ago) Autors: Pau - Mar
-| * 36c37ef - (1 second ago) Autors: Anna - Mar
-| * 4b4163e - (1 second ago) README.md: Secció d'autors - Mar
+* | b7bf0a5 - (1 second ago) Merge branch 'feature/license' - Pau (origin/develop)
+* | 2bc4029 - (2 seconds ago) Merge branch 'feature/readme' - Anna
+| * a216550 - (3 seconds ago) Autors: Mar - Mar (origin/feature/author)
+| * 1d5ba44 - (3 seconds ago) Autors: Pau - Mar
+| * 8683319 - (3 seconds ago) Autors: Anna - Mar
+| * 24be503 - (3 seconds ago) README.md: Secció d'autors - Mar
 |/  
-* b11655b - (2 seconds ago) Commit inicial - Joan Puigcerver (origin/main, origin/HEAD, main)
+* ec0e2bd - (4 seconds ago) Commit inicial - Joan Puigcerver (origin/main, origin/HEAD, main)
diff --git a/docs/files/estrategies/stdout/feature_author_pull.txt b/docs/files/estrategies/stdout/feature_author_pull.txt
@@ -3,18 +3,18 @@ Your branch is behind 'origin/develop' by 2 commits, and can be fast-forwarded.
   (use "git pull" to update your local branch)
 Switched to branch 'develop'
 mar@fp:~/gitflow/mar (develop) $ git pull --ff-only
-Updating b11655b..26e4b55
+Updating ec0e2bd..b7bf0a5
 Fast-forward
  LICENSE   | 5 +++++
  README.md | 6 ++++++
  2 files changed, 11 insertions(+)
  create mode 100644 LICENSE
 mar@fp:~/gitflow/mar (develop) $ git lga
-* 26e4b55 - (0 seconds ago) Merge branch 'feature/license' - Pau (HEAD -> develop, origin/develop)
-* 2241b23 - (1 second ago) Merge branch 'feature/readme' - Anna
-| * 6a65cbc - (1 second ago) Autors: Mar - Mar (origin/feature/author, feature/author)
-| * 41f9bfe - (1 second ago) Autors: Pau - Mar
-| * 36c37ef - (1 second ago) Autors: Anna - Mar
-| * 4b4163e - (1 second ago) README.md: Secció d'autors - Mar
+* b7bf0a5 - (1 second ago) Merge branch 'feature/license' - Pau (HEAD -> develop, origin/develop)
+* 2bc4029 - (2 seconds ago) Merge branch 'feature/readme' - Anna
+| * a216550 - (3 seconds ago) Autors: Mar - Mar (origin/feature/author, feature/author)
+| * 1d5ba44 - (3 seconds ago) Autors: Pau - Mar
+| * 8683319 - (3 seconds ago) Autors: Anna - Mar
+| * 24be503 - (3 seconds ago) README.md: Secció d'autors - Mar
 |/  
-* b11655b - (2 seconds ago) Commit inicial - Joan Puigcerver (origin/main, origin/HEAD, main)
+* ec0e2bd - (4 seconds ago) Commit inicial - Joan Puigcerver (origin/main, origin/HEAD, main)
diff --git a/docs/files/estrategies/stdout/feature_author_push.txt b/docs/files/estrategies/stdout/feature_author_push.txt
@@ -1,17 +1,17 @@
 mar@fp:~/gitflow/mar (develop) $ git push
 To ~/gitflow/remot
-   26e4b55..21278b3  develop -> develop
+   b7bf0a5..f9152dc  develop -> develop
 mar@fp:~/gitflow/mar (develop) $ git lga
-* 21278b3 - (0 seconds ago) Merge branch 'feature/author' - Mar (HEAD -> develop, origin/develop)
-| *   2d65a0b - (0 seconds ago) Merge branch 'develop' into feature/author - Mar (feature/author)
+* f9152dc - (0 seconds ago) Merge branch 'feature/author' - Mar (HEAD -> develop, origin/develop)
+| *   72afb5a - (0 seconds ago) Merge branch 'develop' into feature/author - Mar (feature/author)
 | |\  
 | |/  
 |/|   
-* | 26e4b55 - (0 seconds ago) Merge branch 'feature/license' - Pau
-* | 2241b23 - (1 second ago) Merge branch 'feature/readme' - Anna
-| * 6a65cbc - (1 second ago) Autors: Mar - Mar (origin/feature/author)
-| * 41f9bfe - (1 second ago) Autors: Pau - Mar
-| * 36c37ef - (1 second ago) Autors: Anna - Mar
-| * 4b4163e - (1 second ago) README.md: Secció d'autors - Mar
+* | b7bf0a5 - (1 second ago) Merge branch 'feature/license' - Pau
+* | 2bc4029 - (2 seconds ago) Merge branch 'feature/readme' - Anna
+| * a216550 - (3 seconds ago) Autors: Mar - Mar (origin/feature/author)
+| * 1d5ba44 - (3 seconds ago) Autors: Pau - Mar
+| * 8683319 - (3 seconds ago) Autors: Anna - Mar
+| * 24be503 - (3 seconds ago) README.md: Secció d'autors - Mar
 |/  
-* b11655b - (2 seconds ago) Commit inicial - Joan Puigcerver (origin/main, origin/HEAD, main)
+* ec0e2bd - (4 seconds ago) Commit inicial - Joan Puigcerver (origin/main, origin/HEAD, main)
diff --git a/docs/files/estrategies/stdout/feature_license.txt b/docs/files/estrategies/stdout/feature_license.txt
@@ -2,7 +2,7 @@ pau@fp:~/gitflow $ cd ~/gitflow/pau
 pau@fp:~/gitflow/pau (main) $ git config user.name "Pau"
 pau@fp:~/gitflow/pau (main) $ git config user.email "[email protected]"
 pau@fp:~/gitflow/pau (main) $ git checkout develop
-Branch 'develop' set up to track remote branch 'develop' from 'origin'.
+branch 'develop' set up to track 'origin/develop'.
 Switched to a new branch 'develop'
 pau@fp:~/gitflow/pau (develop) $ git checkout -b feature/license
 Switched to a new branch 'feature/license'
@@ -11,19 +11,19 @@ pau@fp:~/gitflow/pau (feature/license) $ echo "## Llicència" >> LICENSE
 pau@fp:~/gitflow/pau (feature/license) $ echo "CC BY-NC-SA 4.0 DEED - Reconeixement-NoComercial-CompartirIgual 4.0 Internacional" >> LICENSE
 pau@fp:~/gitflow/pau (feature/license) $ git add LICENSE
 pau@fp:~/gitflow/pau (feature/license) $ git commit -m "LICENSE: Afegida llicència"
-[feature/license 2da5ca1] LICENSE: Afegida llicència
+[feature/license b11b498] LICENSE: Afegida llicència
  1 file changed, 3 insertions(+)
  create mode 100644 LICENSE
 pau@fp:~/gitflow/pau (feature/license) $ echo "" >> LICENSE
 pau@fp:~/gitflow/pau (feature/license) $ echo "Més informació: https://creativecommons.org/licenses/by-nc-sa/4.0/deed.ca" >> LICENSE
 pau@fp:~/gitflow/pau (feature/license) $ git commit -a -m "LICENSE: Enllaç a la llicència"
-[feature/license c424285] LICENSE: Enllaç a la llicència
+[feature/license c213387] LICENSE: Enllaç a la llicència
  1 file changed, 2 insertions(+)
 pau@fp:~/gitflow/pau (feature/license) $ git push -u origin feature/license
-Branch 'feature/license' set up to track remote branch 'feature/license' from 'origin'.
+branch 'feature/license' set up to track 'origin/feature/license'.
 To ~/gitflow/remot
  * [new branch]      feature/license -> feature/license
 pau@fp:~/gitflow/pau (feature/license) $ git lga
-* c424285 - (0 seconds ago) LICENSE: Enllaç a la llicència - Pau (HEAD -> feature/license, origin/feature/license)
-* 2da5ca1 - (0 seconds ago) LICENSE: Afegida llicència - Pau
-* b11655b - (1 second ago) Commit inicial - Joan Puigcerver (origin/main, origin/develop, origin/HEAD, main, develop)
+* c213387 - (0 seconds ago) LICENSE: Enllaç a la llicència - Pau (HEAD -> feature/license, origin/feature/license)
+* b11b498 - (0 seconds ago) LICENSE: Afegida llicència - Pau
+* ec0e2bd - (1 second ago) Commit inicial - Joan Puigcerver (origin/main, origin/develop, origin/HEAD, main, develop)
diff --git a/docs/files/estrategies/stdout/feature_license_delete.txt b/docs/files/estrategies/stdout/feature_license_delete.txt
@@ -1,14 +1,14 @@
 pau@fp:~/gitflow/pau (develop) $ git branch -D feature/license
-Deleted branch feature/license (was b09b1fb).
+Deleted branch feature/license (was 5b6d510).
 pau@fp:~/gitflow/pau (develop) $ git push origin --delete feature/license
 To ~/gitflow/remot
  - [deleted]         feature/license
 pau@fp:~/gitflow/pau (develop) $ git lga
-* 26e4b55 - (0 seconds ago) Merge branch 'feature/license' - Pau (HEAD -> develop, origin/develop)
-* 2241b23 - (1 second ago) Merge branch 'feature/readme' - Anna
-| * 6a65cbc - (1 second ago) Autors: Mar - Mar (origin/feature/author)
-| * 41f9bfe - (1 second ago) Autors: Pau - Mar
-| * 36c37ef - (1 second ago) Autors: Anna - Mar
-| * 4b4163e - (1 second ago) README.md: Secció d'autors - Mar
+* b7bf0a5 - (0 seconds ago) Merge branch 'feature/license' - Pau (HEAD -> develop, origin/develop)
+* 2bc4029 - (1 second ago) Merge branch 'feature/readme' - Anna
+| * a216550 - (2 seconds ago) Autors: Mar - Mar (origin/feature/author)
+| * 1d5ba44 - (2 seconds ago) Autors: Pau - Mar
+| * 8683319 - (2 seconds ago) Autors: Anna - Mar
+| * 24be503 - (2 seconds ago) README.md: Secció d'autors - Mar
 |/  
-* b11655b - (2 seconds ago) Commit inicial - Joan Puigcerver (origin/main, origin/HEAD, main)
+* ec0e2bd - (3 seconds ago) Commit inicial - Joan Puigcerver (origin/main, origin/HEAD, main)