If you use build scope consider this option: build(deps): bump React version to “17.0.2” Conventional commits are based on the Angular conventional commits. Angular’s CONTRIBUTING.md states: build: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
Add a new remote (say, other) in your own repo. Pull other/<branch> changes into your local branch (say, add-other-changes). Push to your own forked repo (origin/add-other-changes). Now, when’re you done with add-other-changes branch, create a Pull request & merge it with origin/master. Pull other repo’s changes into your own repo: # go into your own … Read more
Interactive rebase off of a point earlier in the history than the commit you need to modify (git rebase -i <earliercommit>). In the list of commits being rebased, change the text from pick to edit next to the hash of the one you want to modify. Then when git prompts you to change the commit, … Read more
This gives a log of all commits between origin/master and HEAD: git log origin/master..HEAD When HEAD is on the master branch, this gives a log of unpushed commits. Similarly, to view the diff: git diff origin/master..HEAD
The solution is to add changes once with a git command. Use terminal and navigate to Xcode project folder. If you are in the right folder, this command: ls -al will list a .git folder. Then you know you’re at the right place. Then execute git commit -a -m “Commit title here” After that commit … Read more
From the git-stash documentation: A stash is by default listed as “WIP on branchname …”, but you can give a more descriptive message on the command line when you create one. WIP stands for work in progress.
Github provide a useful help page on removing files like this. There are also other questions on StackOverflow which cover this Completely remove unwanted file from Git repository history How can I completely remove a file from a git repository? See also this section of the Pro Git book, an example given there: To remove … Read more
One simple (but slow) way to do this is with git filter-branch and –prune-empty. With no other filters, no other commits will be altered, but any empty ones will be discarded (which will cause all subsequent commits to have new parent-IDs and is therefore still “rewrites history”: not a big deal if this is your … Read more
When you did a git-pull, modifications from the remote branch were merged into your local branch. The automatically generated commit signifies that. Merging could have resulted in conflicts, which would then need to be resolved manually. In your particular case, this did not happen and git could take care of everything.
You probably want to set up a prepare-commit-msg hook on your local repository. It might look like this (say the branches are named ‘work-on-ticket-XXXX’: #!/bin/sh ORIG_MSG_FILE=”$1″ TEMP=`mktemp /tmp/git-XXXXX` TICKETNO=`git branch | grep ‘^\*’ | cut -b3-` (echo “Work on ticket #$TICKETNO”; cat “$ORIG_MSG_FILE”) > “$TEMP” cat “$TEMP” > “$ORIG_MSG_FILE” Put something like that (marked executable) … Read more