diff --git a/docs/files/estrategies/estrategies.py b/docs/files/estrategies/estrategies.py index 5407007..ff0bcf2 100755 --- a/docs/files/estrategies/estrategies.py +++ b/docs/files/estrategies/estrategies.py @@ -63,13 +63,14 @@ 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 "" @@ -77,7 +78,7 @@ 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 index 0860453..c8e827e 100644 --- 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 index 33cd2a6..a9afffb 100644 --- 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 index 74c9265..59d8dfe 100644 --- 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 index f3e0577..b1dc0b4 100644 --- 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 "mar@fpmislata.com" 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 (anna@fpmislata.com)" >> 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 (pau@fpmislata.com)" >> 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 (mar@fpmislata.com)" >> 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 index 548df4b..192a8d2 100644 --- 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 index 8a4b6e9..8e2643b 100644 --- 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 index d14a6b5..4e757f4 100644 --- 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 index 89612af..c2a0adb 100644 --- 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 index 2b52711..7b73324 100644 --- 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 index 7b7d2fe..2c57fc7 100644 --- 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 index 846b21d..2613c78 100644 --- 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 "pau@fpmislata.com" 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 index c82013f..e8d3eef 100644 --- 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) diff --git a/docs/files/estrategies/stdout/feature_license_fetch.txt b/docs/files/estrategies/stdout/feature_license_fetch.txt index 6cce983..daa2223 100644 --- a/docs/files/estrategies/stdout/feature_license_fetch.txt +++ b/docs/files/estrategies/stdout/feature_license_fetch.txt @@ -1,16 +1,16 @@ pau@fp:~/gitflow $ cd ~/gitflow/pau pau@fp:~/gitflow/pau (feature/license) $ git fetch From ~/gitflow/remot - b11655b..2241b23 develop -> origin/develop + ec0e2bd..2bc4029 develop -> origin/develop * [new branch] feature/author -> origin/feature/author 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 -| * 2241b23 - (0 seconds ago) Merge branch 'feature/readme' - Anna (origin/develop) +* 2bc4029 - (0 seconds ago) Merge branch 'feature/readme' - Anna (origin/develop) +| * c213387 - (1 second ago) LICENSE: Enllaç a la llicència - Pau (HEAD -> feature/license, origin/feature/license) +| * b11b498 - (1 second ago) LICENSE: Afegida llicència - Pau |/ -| * 6a65cbc - (0 seconds ago) Autors: Mar - Mar (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 +| * a216550 - (1 second ago) Autors: Mar - Mar (origin/feature/author) +| * 1d5ba44 - (1 second ago) Autors: Pau - Mar +| * 8683319 - (1 second ago) Autors: Anna - Mar +| * 24be503 - (1 second ago) README.md: Secció d'autors - Mar |/ -* b11655b - (1 second ago) Commit inicial - Joan Puigcerver (origin/main, origin/HEAD, main, develop) +* ec0e2bd - (2 seconds ago) Commit inicial - Joan Puigcerver (origin/main, origin/HEAD, main, develop) diff --git a/docs/files/estrategies/stdout/feature_license_merge.txt b/docs/files/estrategies/stdout/feature_license_merge.txt index f6e6cc9..84046ae 100644 --- a/docs/files/estrategies/stdout/feature_license_merge.txt +++ b/docs/files/estrategies/stdout/feature_license_merge.txt @@ -6,15 +6,15 @@ Merge made by the 'ort' strategy. README.md | 6 ++++++ 1 file changed, 6 insertions(+) pau@fp:~/gitflow/pau (feature/license) $ git lga -* b09b1fb - (1 second ago) Merge branch 'develop' into feature/license - Pau (HEAD -> feature/license) +* 5b6d510 - (0 seconds ago) Merge branch 'develop' into feature/license - Pau (HEAD -> feature/license) |\ -| * 2241b23 - (1 second ago) Merge branch 'feature/readme' - Anna (origin/develop, develop) -* | c424285 - (1 second ago) LICENSE: Enllaç a la llicència - Pau (origin/feature/license) -* | 2da5ca1 - (1 second ago) LICENSE: Afegida llicència - Pau +| * 2bc4029 - (1 second ago) Merge branch 'feature/readme' - Anna (origin/develop, develop) +* | c213387 - (2 seconds ago) LICENSE: Enllaç a la llicència - Pau (origin/feature/license) +* | b11b498 - (2 seconds ago) LICENSE: Afegida llicència - Pau |/ -| * 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 +| * 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) diff --git a/docs/files/estrategies/stdout/feature_license_merge_squash.txt b/docs/files/estrategies/stdout/feature_license_merge_squash.txt index 3dec0a5..01b34b1 100644 --- a/docs/files/estrategies/stdout/feature_license_merge_squash.txt +++ b/docs/files/estrategies/stdout/feature_license_merge_squash.txt @@ -2,7 +2,7 @@ pau@fp:~/gitflow/pau (feature/license) $ git checkout develop Your branch is up to date with 'origin/develop'. Switched to branch 'develop' pau@fp:~/gitflow/pau (develop) $ git merge --squash feature/license -Updating 2241b23..b09b1fb +Updating 2bc4029..5b6d510 Fast-forward Squash commit -- not updating HEAD LICENSE | 5 +++++ @@ -29,22 +29,22 @@ index 0000000..809d714 + +Més informació: https://creativecommons.org/licenses/by-nc-sa/4.0/deed.ca pau@fp:~/gitflow/pau (develop) $ git commit -m "Merge branch 'feature/license'" -[develop 26e4b55] Merge branch 'feature/license' +[develop b7bf0a5] Merge branch 'feature/license' 1 file changed, 5 insertions(+) create mode 100644 LICENSE pau@fp:~/gitflow/pau (develop) $ git lga -* 26e4b55 - (0 seconds ago) Merge branch 'feature/license' - Pau (HEAD -> develop) -| * b09b1fb - (1 second ago) Merge branch 'develop' into feature/license - Pau (feature/license) +* b7bf0a5 - (0 seconds ago) Merge branch 'feature/license' - Pau (HEAD -> develop) +| * 5b6d510 - (0 seconds ago) Merge branch 'develop' into feature/license - Pau (feature/license) | |\ | |/ |/| -* | 2241b23 - (1 second ago) Merge branch 'feature/readme' - Anna (origin/develop) -| * c424285 - (1 second ago) LICENSE: Enllaç a la llicència - Pau (origin/feature/license) -| * 2da5ca1 - (1 second ago) LICENSE: Afegida llicència - Pau +* | 2bc4029 - (1 second ago) Merge branch 'feature/readme' - Anna (origin/develop) +| * c213387 - (2 seconds ago) LICENSE: Enllaç a la llicència - Pau (origin/feature/license) +| * b11b498 - (2 seconds ago) LICENSE: Afegida llicència - Pau |/ -| * 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 +| * 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) diff --git a/docs/files/estrategies/stdout/feature_license_pull.txt b/docs/files/estrategies/stdout/feature_license_pull.txt index 46b0403..c2320b1 100644 --- a/docs/files/estrategies/stdout/feature_license_pull.txt +++ b/docs/files/estrategies/stdout/feature_license_pull.txt @@ -3,18 +3,18 @@ Your branch is behind 'origin/develop' by 1 commit, and can be fast-forwarded. (use "git pull" to update your local branch) Switched to branch 'develop' pau@fp:~/gitflow/pau (develop) $ git pull --ff-only -Updating b11655b..2241b23 +Updating ec0e2bd..2bc4029 Fast-forward README.md | 6 ++++++ 1 file changed, 6 insertions(+) pau@fp:~/gitflow/pau (develop) $ git lga -* 2241b23 - (0 seconds ago) Merge branch 'feature/readme' - Anna (HEAD -> develop, origin/develop) -| * c424285 - (0 seconds ago) LICENSE: Enllaç a la llicència - Pau (origin/feature/license, feature/license) -| * 2da5ca1 - (0 seconds ago) LICENSE: Afegida llicència - Pau +* 2bc4029 - (1 second ago) Merge branch 'feature/readme' - Anna (HEAD -> develop, origin/develop) +| * c213387 - (2 seconds ago) LICENSE: Enllaç a la llicència - Pau (origin/feature/license, feature/license) +| * b11b498 - (2 seconds ago) LICENSE: Afegida llicència - Pau |/ -| * 6a65cbc - (0 seconds ago) Autors: Mar - Mar (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 +| * 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 - (1 second ago) Commit inicial - Joan Puigcerver (origin/main, origin/HEAD, main) +* ec0e2bd - (3 seconds ago) Commit inicial - Joan Puigcerver (origin/main, origin/HEAD, main) diff --git a/docs/files/estrategies/stdout/feature_license_push.txt b/docs/files/estrategies/stdout/feature_license_push.txt index 5f47d85..4ff95f5 100644 --- a/docs/files/estrategies/stdout/feature_license_push.txt +++ b/docs/files/estrategies/stdout/feature_license_push.txt @@ -1,19 +1,19 @@ pau@fp:~/gitflow/pau (develop) $ git push To ~/gitflow/remot - 2241b23..26e4b55 develop -> develop + 2bc4029..b7bf0a5 develop -> develop pau@fp:~/gitflow/pau (develop) $ git lga -* 26e4b55 - (0 seconds ago) Merge branch 'feature/license' - Pau (HEAD -> develop, origin/develop) -| * b09b1fb - (1 second ago) Merge branch 'develop' into feature/license - Pau (feature/license) +* b7bf0a5 - (0 seconds ago) Merge branch 'feature/license' - Pau (HEAD -> develop, origin/develop) +| * 5b6d510 - (0 seconds ago) Merge branch 'develop' into feature/license - Pau (feature/license) | |\ | |/ |/| -* | 2241b23 - (1 second ago) Merge branch 'feature/readme' - Anna -| * c424285 - (1 second ago) LICENSE: Enllaç a la llicència - Pau (origin/feature/license) -| * 2da5ca1 - (1 second ago) LICENSE: Afegida llicència - Pau +* | 2bc4029 - (1 second ago) Merge branch 'feature/readme' - Anna +| * c213387 - (2 seconds ago) LICENSE: Enllaç a la llicència - Pau (origin/feature/license) +| * b11b498 - (2 seconds ago) LICENSE: Afegida llicència - Pau |/ -| * 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 +| * 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) diff --git a/docs/files/estrategies/stdout/feature_readme.txt b/docs/files/estrategies/stdout/feature_readme.txt index ec99912..1c95748 100644 --- a/docs/files/estrategies/stdout/feature_readme.txt +++ b/docs/files/estrategies/stdout/feature_readme.txt @@ -2,7 +2,7 @@ anna@fp:~/gitflow $ cd ~/gitflow/anna anna@fp:~/gitflow/anna (main) $ git config user.name "Anna" anna@fp:~/gitflow/anna (main) $ git config user.email "anna@fpmislata.com" anna@fp:~/gitflow/anna (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' anna@fp:~/gitflow/anna (develop) $ git checkout -b feature/readme Switched to a new branch 'feature/readme' @@ -10,19 +10,19 @@ anna@fp:~/gitflow/anna (feature/readme) $ echo "Les estratègies de ramificació anna@fp:~/gitflow/anna (feature/readme) $ echo "marc de treball organitzat que facilita la col·laboració" >> README.md anna@fp:~/gitflow/anna (feature/readme) $ echo "entre diferents desenvolupadors en un mateix projecte" >> README.md anna@fp:~/gitflow/anna (feature/readme) $ git commit -a -m "README.md: Descripció" -[feature/readme a32d18d] README.md: Descripció +[feature/readme 502dadb] README.md: Descripció 1 file changed, 3 insertions(+) anna@fp:~/gitflow/anna (feature/readme) $ echo "" >> README.md anna@fp:~/gitflow/anna (feature/readme) $ echo "La característica principal és la utilització" >> README.md anna@fp:~/gitflow/anna (feature/readme) $ echo "de branques amb un únic propòsit." >> README.md anna@fp:~/gitflow/anna (feature/readme) $ git commit -a -m "README.md: Branques propòsit únic" -[feature/readme 60e7175] README.md: Branques propòsit únic +[feature/readme ea2559a] README.md: Branques propòsit únic 1 file changed, 3 insertions(+) anna@fp:~/gitflow/anna (feature/readme) $ git push -u origin feature/readme -Branch 'feature/readme' set up to track remote branch 'feature/readme' from 'origin'. +branch 'feature/readme' set up to track 'origin/feature/readme'. To ~/gitflow/remot * [new branch] feature/readme -> feature/readme anna@fp:~/gitflow/anna (feature/readme) $ git lga -* 60e7175 - (0 seconds ago) README.md: Branques propòsit únic - Anna (HEAD -> feature/readme, origin/feature/readme) -* a32d18d - (0 seconds ago) README.md: Descripció - Anna -* b11655b - (1 second ago) Commit inicial - Joan Puigcerver (origin/main, origin/develop, origin/HEAD, main, develop) +* ea2559a - (0 seconds ago) README.md: Branques propòsit únic - Anna (HEAD -> feature/readme, origin/feature/readme) +* 502dadb - (0 seconds ago) README.md: Descripció - Anna +* ec0e2bd - (0 seconds ago) Commit inicial - Joan Puigcerver (origin/main, origin/develop, origin/HEAD, main, develop) diff --git a/docs/files/estrategies/stdout/feature_readme_delete.txt b/docs/files/estrategies/stdout/feature_readme_delete.txt index 0f37752..6684c47 100644 --- a/docs/files/estrategies/stdout/feature_readme_delete.txt +++ b/docs/files/estrategies/stdout/feature_readme_delete.txt @@ -1,16 +1,16 @@ anna@fp:~/gitflow/anna (develop) $ git branch -D feature/readme -Deleted branch feature/readme (was 60e7175). +Deleted branch feature/readme (was ea2559a). anna@fp:~/gitflow/anna (develop) $ git push origin --delete feature/readme To ~/gitflow/remot - [deleted] feature/readme anna@fp:~/gitflow/anna (develop) $ git lga -* 2241b23 - (0 seconds ago) Merge branch 'feature/readme' - Anna (HEAD -> develop, origin/develop) -| * 6a65cbc - (0 seconds ago) Autors: Mar - Mar (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 +* 2bc4029 - (0 seconds ago) Merge branch 'feature/readme' - Anna (HEAD -> develop, origin/develop) +| * a216550 - (1 second ago) Autors: Mar - Mar (origin/feature/author) +| * 1d5ba44 - (1 second ago) Autors: Pau - Mar +| * 8683319 - (1 second ago) Autors: Anna - Mar +| * 24be503 - (1 second ago) README.md: Secció d'autors - Mar |/ -| * c424285 - (0 seconds ago) LICENSE: Enllaç a la llicència - Pau (origin/feature/license) -| * 2da5ca1 - (0 seconds ago) LICENSE: Afegida llicència - Pau +| * c213387 - (1 second ago) LICENSE: Enllaç a la llicència - Pau (origin/feature/license) +| * b11b498 - (1 second ago) LICENSE: Afegida llicència - Pau |/ -* b11655b - (1 second ago) Commit inicial - Joan Puigcerver (origin/main, origin/HEAD, main) +* ec0e2bd - (2 seconds ago) Commit inicial - Joan Puigcerver (origin/main, origin/HEAD, main) diff --git a/docs/files/estrategies/stdout/feature_readme_fetch.txt b/docs/files/estrategies/stdout/feature_readme_fetch.txt index d1e57c8..5970aa9 100644 --- a/docs/files/estrategies/stdout/feature_readme_fetch.txt +++ b/docs/files/estrategies/stdout/feature_readme_fetch.txt @@ -4,14 +4,14 @@ From ~/gitflow/remot * [new branch] feature/author -> origin/feature/author * [new branch] feature/license -> origin/feature/license anna@fp:~/gitflow/anna (feature/readme) $ git lga -* 60e7175 - (0 seconds ago) README.md: Branques propòsit únic - Anna (HEAD -> feature/readme, origin/feature/readme) -* a32d18d - (0 seconds ago) README.md: Descripció - Anna -| * 6a65cbc - (0 seconds ago) Autors: Mar - Mar (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 +* a216550 - (1 second ago) Autors: Mar - Mar (origin/feature/author) +* 1d5ba44 - (1 second ago) Autors: Pau - Mar +* 8683319 - (1 second ago) Autors: Anna - Mar +* 24be503 - (1 second ago) README.md: Secció d'autors - Mar +| * c213387 - (1 second ago) LICENSE: Enllaç a la llicència - Pau (origin/feature/license) +| * b11b498 - (1 second ago) LICENSE: Afegida llicència - Pau |/ -| * c424285 - (0 seconds ago) LICENSE: Enllaç a la llicència - Pau (origin/feature/license) -| * 2da5ca1 - (0 seconds ago) LICENSE: Afegida llicència - Pau +| * ea2559a - (2 seconds ago) README.md: Branques propòsit únic - Anna (HEAD -> feature/readme, origin/feature/readme) +| * 502dadb - (2 seconds ago) README.md: Descripció - Anna |/ -* b11655b - (1 second ago) Commit inicial - Joan Puigcerver (origin/main, origin/develop, origin/HEAD, main, develop) +* ec0e2bd - (2 seconds ago) Commit inicial - Joan Puigcerver (origin/main, origin/develop, origin/HEAD, main, develop) diff --git a/docs/files/estrategies/stdout/feature_readme_merge_squash.txt b/docs/files/estrategies/stdout/feature_readme_merge_squash.txt index bf6ad1b..cdad3ea 100644 --- a/docs/files/estrategies/stdout/feature_readme_merge_squash.txt +++ b/docs/files/estrategies/stdout/feature_readme_merge_squash.txt @@ -2,7 +2,7 @@ anna@fp:~/gitflow/anna (feature/readme) $ git checkout develop Your branch is up to date with 'origin/develop'. Switched to branch 'develop' anna@fp:~/gitflow/anna (develop) $ git merge --squash feature/readme -Updating b11655b..60e7175 +Updating ec0e2bd..ea2559a Fast-forward Squash commit -- not updating HEAD README.md | 6 ++++++ @@ -29,19 +29,19 @@ index 05c1f5b..9e7f142 100644 +La característica principal és la utilització +de branques amb un únic propòsit. anna@fp:~/gitflow/anna (develop) $ git commit -m "Merge branch 'feature/readme'" -[develop 2241b23] Merge branch 'feature/readme' +[develop 2bc4029] Merge branch 'feature/readme' 1 file changed, 6 insertions(+) anna@fp:~/gitflow/anna (develop) $ git lga -* 2241b23 - (0 seconds ago) Merge branch 'feature/readme' - Anna (HEAD -> develop) -| * 60e7175 - (0 seconds ago) README.md: Branques propòsit únic - Anna (origin/feature/readme, feature/readme) -| * a32d18d - (0 seconds ago) README.md: Descripció - Anna +* 2bc4029 - (0 seconds ago) Merge branch 'feature/readme' - Anna (HEAD -> develop) +| * a216550 - (1 second ago) Autors: Mar - Mar (origin/feature/author) +| * 1d5ba44 - (1 second ago) Autors: Pau - Mar +| * 8683319 - (1 second ago) Autors: Anna - Mar +| * 24be503 - (1 second ago) README.md: Secció d'autors - Mar |/ -| * 6a65cbc - (0 seconds ago) Autors: Mar - Mar (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 +| * c213387 - (1 second ago) LICENSE: Enllaç a la llicència - Pau (origin/feature/license) +| * b11b498 - (1 second ago) LICENSE: Afegida llicència - Pau |/ -| * c424285 - (0 seconds ago) LICENSE: Enllaç a la llicència - Pau (origin/feature/license) -| * 2da5ca1 - (0 seconds ago) LICENSE: Afegida llicència - Pau +| * ea2559a - (2 seconds ago) README.md: Branques propòsit únic - Anna (origin/feature/readme, feature/readme) +| * 502dadb - (2 seconds ago) README.md: Descripció - Anna |/ -* b11655b - (1 second ago) Commit inicial - Joan Puigcerver (origin/main, origin/develop, origin/HEAD, main) +* ec0e2bd - (2 seconds ago) Commit inicial - Joan Puigcerver (origin/main, origin/develop, origin/HEAD, main) diff --git a/docs/files/estrategies/stdout/feature_readme_push.txt b/docs/files/estrategies/stdout/feature_readme_push.txt index c7d7ab2..f430486 100644 --- a/docs/files/estrategies/stdout/feature_readme_push.txt +++ b/docs/files/estrategies/stdout/feature_readme_push.txt @@ -1,17 +1,17 @@ anna@fp:~/gitflow/anna (develop) $ git push To ~/gitflow/remot - b11655b..2241b23 develop -> develop + ec0e2bd..2bc4029 develop -> develop anna@fp:~/gitflow/anna (develop) $ git lga -* 2241b23 - (0 seconds ago) Merge branch 'feature/readme' - Anna (HEAD -> develop, origin/develop) -| * 60e7175 - (0 seconds ago) README.md: Branques propòsit únic - Anna (origin/feature/readme, feature/readme) -| * a32d18d - (0 seconds ago) README.md: Descripció - Anna +* 2bc4029 - (0 seconds ago) Merge branch 'feature/readme' - Anna (HEAD -> develop, origin/develop) +| * a216550 - (1 second ago) Autors: Mar - Mar (origin/feature/author) +| * 1d5ba44 - (1 second ago) Autors: Pau - Mar +| * 8683319 - (1 second ago) Autors: Anna - Mar +| * 24be503 - (1 second ago) README.md: Secció d'autors - Mar |/ -| * 6a65cbc - (0 seconds ago) Autors: Mar - Mar (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 +| * c213387 - (1 second ago) LICENSE: Enllaç a la llicència - Pau (origin/feature/license) +| * b11b498 - (1 second ago) LICENSE: Afegida llicència - Pau |/ -| * c424285 - (0 seconds ago) LICENSE: Enllaç a la llicència - Pau (origin/feature/license) -| * 2da5ca1 - (0 seconds ago) LICENSE: Afegida llicència - Pau +| * ea2559a - (2 seconds ago) README.md: Branques propòsit únic - Anna (origin/feature/readme, feature/readme) +| * 502dadb - (2 seconds ago) README.md: Descripció - Anna |/ -* b11655b - (1 second ago) Commit inicial - Joan Puigcerver (origin/main, origin/HEAD, main) +* ec0e2bd - (2 seconds ago) Commit inicial - Joan Puigcerver (origin/main, origin/HEAD, main) diff --git a/docs/files/estrategies/stdout/release.txt b/docs/files/estrategies/stdout/release.txt index 116ecca..11cc93d 100644 --- a/docs/files/estrategies/stdout/release.txt +++ b/docs/files/estrategies/stdout/release.txt @@ -1,12 +1,12 @@ anna@fp:~/gitflow/anna (release/v1.0.0) $ echo "v1.0.0" > VERSION anna@fp:~/gitflow/anna (release/v1.0.0) $ git add VERSION anna@fp:~/gitflow/anna (release/v1.0.0) $ git commit -m "Publicada versió: v1.0.0" -[release/v1.0.0 b76e143] Publicada versió: v1.0.0 +[release/v1.0.0 2c075dd] Publicada versió: v1.0.0 1 file changed, 1 insertion(+) create mode 100644 VERSION anna@fp:~/gitflow/anna (release/v1.0.0) $ git lga -* b76e143 - (0 seconds ago) Publicada versió: v1.0.0 - Anna (HEAD -> release/v1.0.0) -* 21278b3 - (0 seconds ago) Merge branch 'feature/author' - Mar (origin/develop, 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) +* 2c075dd - (0 seconds ago) Publicada versió: v1.0.0 - Anna (HEAD -> release/v1.0.0) +* f9152dc - (0 seconds ago) Merge branch 'feature/author' - Mar (origin/develop, 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/release_create.txt b/docs/files/estrategies/stdout/release_create.txt index f05cf9a..8ad8eb4 100644 --- a/docs/files/estrategies/stdout/release_create.txt +++ b/docs/files/estrategies/stdout/release_create.txt @@ -1,7 +1,7 @@ anna@fp:~/gitflow/anna (develop) $ git checkout -b release/v1.0.0 Switched to a new branch 'release/v1.0.0' anna@fp:~/gitflow/anna (release/v1.0.0) $ git lga -* 21278b3 - (0 seconds ago) Merge branch 'feature/author' - Mar (HEAD -> release/v1.0.0, origin/develop, 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 -> release/v1.0.0, origin/develop, 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/release_delete.txt b/docs/files/estrategies/stdout/release_delete.txt index b51852d..daacf3d 100644 --- a/docs/files/estrategies/stdout/release_delete.txt +++ b/docs/files/estrategies/stdout/release_delete.txt @@ -1,11 +1,11 @@ anna@fp:~/gitflow/anna (main) $ git branch -D release/v1.0.0 -Deleted branch release/v1.0.0 (was b76e143). +Deleted branch release/v1.0.0 (was 2c075dd). anna@fp:~/gitflow/anna (main) $ git push origin --delete release/v1.0.0 error: unable to delete 'release/v1.0.0': remote ref does not exist error: failed to push some refs to '~/gitflow/remot' anna@fp:~/gitflow/anna (main) $ git lga -* b76e143 - (1 second ago) Publicada versió: v1.0.0 - Anna (HEAD -> main, tag: v1.0.0, origin/main, origin/develop, origin/HEAD, develop) -* 21278b3 - (1 second ago) Merge branch 'feature/author' - Mar -* 26e4b55 - (1 second ago) Merge branch 'feature/license' - Pau -* 2241b23 - (2 seconds ago) Merge branch 'feature/readme' - Anna -* b11655b - (3 seconds ago) Commit inicial - Joan Puigcerver +* 2c075dd - (1 second ago) Publicada versió: v1.0.0 - Anna (HEAD -> main, tag: v1.0.0, origin/main, origin/develop, origin/HEAD, develop) +* f9152dc - (1 second ago) Merge branch 'feature/author' - Mar +* b7bf0a5 - (2 seconds ago) Merge branch 'feature/license' - Pau +* 2bc4029 - (3 seconds ago) Merge branch 'feature/readme' - Anna +* ec0e2bd - (5 seconds ago) Commit inicial - Joan Puigcerver diff --git a/docs/files/estrategies/stdout/release_merge_develop.txt b/docs/files/estrategies/stdout/release_merge_develop.txt index 701c94f..1a33fbe 100644 --- a/docs/files/estrategies/stdout/release_merge_develop.txt +++ b/docs/files/estrategies/stdout/release_merge_develop.txt @@ -2,17 +2,17 @@ anna@fp:~/gitflow/anna (release/v1.0.0) $ git checkout develop Your branch is up to date with 'origin/develop'. Switched to branch 'develop' anna@fp:~/gitflow/anna (develop) $ git merge --ff-only release/v1.0.0 -Updating 21278b3..b76e143 +Updating f9152dc..2c075dd Fast-forward VERSION | 1 + 1 file changed, 1 insertion(+) create mode 100644 VERSION anna@fp:~/gitflow/anna (develop) $ git push To ~/gitflow/remot - 21278b3..b76e143 develop -> develop + f9152dc..2c075dd develop -> develop anna@fp:~/gitflow/anna (develop) $ git lga -* b76e143 - (0 seconds ago) Publicada versió: v1.0.0 - Anna (HEAD -> develop, origin/develop, release/v1.0.0) -* 21278b3 - (0 seconds ago) Merge branch 'feature/author' - Mar -* 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) +* 2c075dd - (0 seconds ago) Publicada versió: v1.0.0 - Anna (HEAD -> develop, origin/develop, release/v1.0.0) +* f9152dc - (0 seconds ago) Merge branch 'feature/author' - Mar +* 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/release_merge_main.txt b/docs/files/estrategies/stdout/release_merge_main.txt index 1792b58..f24fae1 100644 --- a/docs/files/estrategies/stdout/release_merge_main.txt +++ b/docs/files/estrategies/stdout/release_merge_main.txt @@ -2,7 +2,7 @@ anna@fp:~/gitflow/anna (develop) $ git checkout main Your branch is up to date with 'origin/main'. Switched to branch 'main' anna@fp:~/gitflow/anna (main) $ git merge --ff-only release/v1.0.0 -Updating b11655b..b76e143 +Updating ec0e2bd..2c075dd Fast-forward LICENSE | 5 +++++ README.md | 11 +++++++++++ @@ -12,10 +12,10 @@ Fast-forward create mode 100644 VERSION anna@fp:~/gitflow/anna (main) $ git push To ~/gitflow/remot - b11655b..b76e143 main -> main + ec0e2bd..2c075dd main -> main anna@fp:~/gitflow/anna (main) $ git lga -* b76e143 - (1 second ago) Publicada versió: v1.0.0 - Anna (HEAD -> main, origin/main, origin/develop, origin/HEAD, release/v1.0.0, develop) -* 21278b3 - (1 second ago) Merge branch 'feature/author' - Mar -* 26e4b55 - (1 second ago) Merge branch 'feature/license' - Pau -* 2241b23 - (2 seconds ago) Merge branch 'feature/readme' - Anna -* b11655b - (3 seconds ago) Commit inicial - Joan Puigcerver +* 2c075dd - (0 seconds ago) Publicada versió: v1.0.0 - Anna (HEAD -> main, origin/main, origin/develop, origin/HEAD, release/v1.0.0, develop) +* f9152dc - (0 seconds ago) Merge branch 'feature/author' - Mar +* 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 diff --git a/docs/files/estrategies/stdout/release_pull.txt b/docs/files/estrategies/stdout/release_pull.txt index 8faeeba..a1a537c 100644 --- a/docs/files/estrategies/stdout/release_pull.txt +++ b/docs/files/estrategies/stdout/release_pull.txt @@ -6,16 +6,16 @@ anna@fp:~/gitflow/anna (develop) $ git fetch --prune From ~/gitflow/remot - [deleted] (none) -> origin/feature/author - [deleted] (none) -> origin/feature/license - 2241b23..21278b3 develop -> origin/develop + 2bc4029..f9152dc develop -> origin/develop anna@fp:~/gitflow/anna (develop) $ git pull --ff-only -Updating 2241b23..21278b3 +Updating 2bc4029..f9152dc Fast-forward LICENSE | 5 +++++ README.md | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 LICENSE anna@fp:~/gitflow/anna (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/release_tag.txt b/docs/files/estrategies/stdout/release_tag.txt index 3da569d..1f3a7fb 100644 --- a/docs/files/estrategies/stdout/release_tag.txt +++ b/docs/files/estrategies/stdout/release_tag.txt @@ -3,8 +3,8 @@ anna@fp:~/gitflow/anna (main) $ git push --tags To ~/gitflow/remot * [new tag] v1.0.0 -> v1.0.0 anna@fp:~/gitflow/anna (main) $ git lga -* b76e143 - (1 second ago) Publicada versió: v1.0.0 - Anna (HEAD -> main, tag: v1.0.0, origin/main, origin/develop, origin/HEAD, release/v1.0.0, develop) -* 21278b3 - (1 second ago) Merge branch 'feature/author' - Mar -* 26e4b55 - (1 second ago) Merge branch 'feature/license' - Pau -* 2241b23 - (2 seconds ago) Merge branch 'feature/readme' - Anna -* b11655b - (3 seconds ago) Commit inicial - Joan Puigcerver +* 2c075dd - (1 second ago) Publicada versió: v1.0.0 - Anna (HEAD -> main, tag: v1.0.0, origin/main, origin/develop, origin/HEAD, release/v1.0.0, develop) +* f9152dc - (1 second ago) Merge branch 'feature/author' - Mar +* b7bf0a5 - (2 seconds ago) Merge branch 'feature/license' - Pau +* 2bc4029 - (3 seconds ago) Merge branch 'feature/readme' - Anna +* ec0e2bd - (5 seconds ago) Commit inicial - Joan Puigcerver diff --git a/docs/files/estrategies/stdout/remot.txt b/docs/files/estrategies/stdout/remot.txt index 6ff1501..bfe2ba5 100644 --- a/docs/files/estrategies/stdout/remot.txt +++ b/docs/files/estrategies/stdout/remot.txt @@ -6,9 +6,9 @@ jpuigcerver@fp:~/gitflow/remot (main) $ git branch -m main jpuigcerver@fp:~/gitflow/remot (main) $ echo "# Estratègies de ramificació" > README.md jpuigcerver@fp:~/gitflow/remot (main) $ git add README.md jpuigcerver@fp:~/gitflow/remot (main) $ git commit -m "Commit inicial" -[main (root-commit) b11655b] Commit inicial +[main (root-commit) ec0e2bd] Commit inicial 1 file changed, 1 insertion(+) create mode 100644 README.md jpuigcerver@fp:~/gitflow/remot (main) $ git lga -* b11655b - (0 seconds ago) Commit inicial - Joan Puigcerver (HEAD -> main) +* ec0e2bd - (0 seconds ago) Commit inicial - Joan Puigcerver (HEAD -> main) jpuigcerver@fp:~/gitflow/remot (main) $ git config --bool core.bare true # (1)! diff --git a/docs/files/estrategies/stdout/squash_final.txt b/docs/files/estrategies/stdout/squash_final.txt index f324637..bd33aec 100644 --- a/docs/files/estrategies/stdout/squash_final.txt +++ b/docs/files/estrategies/stdout/squash_final.txt @@ -1,7 +1,7 @@ jpuigcerver@fp:~/gitflow $ cd ~/gitflow/remot jpuigcerver@fp:~/gitflow/remot (main) $ git lga -* b76e143 - (1 second ago) Publicada versió: v1.0.0 - Anna (HEAD -> main, tag: v1.0.0, develop) -* 21278b3 - (1 second ago) Merge branch 'feature/author' - Mar -* 26e4b55 - (1 second ago) Merge branch 'feature/license' - Pau -* 2241b23 - (2 seconds ago) Merge branch 'feature/readme' - Anna -* b11655b - (3 seconds ago) Commit inicial - Joan Puigcerver +* 2c075dd - (1 second ago) Publicada versió: v1.0.0 - Anna (HEAD -> main, tag: v1.0.0, develop) +* f9152dc - (1 second ago) Merge branch 'feature/author' - Mar +* b7bf0a5 - (2 seconds ago) Merge branch 'feature/license' - Pau +* 2bc4029 - (3 seconds ago) Merge branch 'feature/readme' - Anna +* ec0e2bd - (5 seconds ago) Commit inicial - Joan Puigcerver