Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 22 additions & 24 deletions Readme.md
Original file line number Diff line number Diff line change
@@ -1,34 +1,32 @@
# Git Extras
# Adaptions to Git Extras

Little git extras.
Forked from: https://github.com/tj/git-extras/

## Screencasts
Instead of contributing my way of thinking i will

Just getting started? Check out these screencasts:
1. adapt the code to fix problems that i have
2. see how it works for me.

* [introduction](https://vimeo.com/45506445) ([archive.org link](https://web.archive.org/web/20230219181235id_/vod-progressive.akamaized.net/exp=1676834145~acl=%2Fvimeo-prod-skyfire-std-us%2F01%2F4101%2F1%2F45506445%2F107111328.mp4~hmac=065b68f23c4b6a222463097b36d1c346995a9559baa9b819972da95550018471/vimeo-prod-skyfire-std-us/01/4101/1/45506445/107111328.mp4)) -- covers `git-ignore`, `git-setup`, `git-changelog`, `git-release`, `git-effort` and more
# installation

## Installation
```bash
re-install.sh
```

See the [Installation](Installation.md) page.
# Updating to a new version

## Commands
```bash
git fetch origin
git tag --sort=v:refname | tail

Go to the [Commands](Commands.md) page for basic usage and examples.
NEW_TAG=7.4.0 # <-- update this to the latest tag

__GIT utilities__ -- repo summary, repl, changelog population, author commit percentages and more
git co tomsit-master
git branch origin-$NEW_TAG $NEW_TAG
git rebase $NEW_TAG
# resolve conflicts

## Contributing

Interested in contributing? Awesome!

Please read [Contributing](CONTRIBUTING.md) before you make a PR, thanks!

## The change of the default branch

As of Git Extras 6.4 the assumed default branch name changed from `master` to `main`.
This affects the Git Extras commands `git archive-file`, `git delete-merged-branches`, `git delta`, `git pull-request`, `git show-merged-branches`, `git show-unmerged-branches`, and `git squash`.

To change the default branch name to `master`: change either the configuration `git-extras.default-branch` or `init.defaultBranch` to `master`; the former takes precedence.

For example, `git config git-extras.default-branch master`.
#update the PR https://github.com/elonderin/git-extras/pull/3 base to the new origin-$NEW_TAG

re-install.sh
```
78 changes: 0 additions & 78 deletions bin/git-cp

This file was deleted.

2 changes: 1 addition & 1 deletion bin/git-delete-tag
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
test -z "$1" && echo "tag required." 1>&2 && exit 1

# Detect the default remote exists or not
default_remote=$(git config git-extras.default-remote)
default_remote=$(git default-remote)

if [[ -n "$default_remote" ]]; then
origin="$default_remote"
Expand Down
2 changes: 1 addition & 1 deletion bin/git-feature
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ do
remote=$2
shift
else
remote="origin"
remote=$(git default-remote)
fi
;;
-s|--separator )
Expand Down
24 changes: 0 additions & 24 deletions man/git-cp.1

This file was deleted.

114 changes: 0 additions & 114 deletions man/git-cp.html

This file was deleted.

30 changes: 0 additions & 30 deletions man/git-cp.md

This file was deleted.

4 changes: 4 additions & 0 deletions re-install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env bash

sudo make uninstall
sudo make install