utils-code/tj.git-extras
1
0
Fork 0
mirror of https://github.com/tj/git-extras.git synced 2026-09-15 18:06:24 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
1747 commits 5 branches 57 tags 6.1 MiB
Commit graph

868 commits

Author SHA1 Message Date
Tobias Fendin a7b7f05b5b Add incompability check for git summary --line --no-merges, split synopsis in its manual. 2021-08-11 16:38:21 +02:00
ax1036 296f2a7ad2 fix git (un)lock with spaced filenames 2021-08-10 14:17:33 +02:00
Tobias Fendin 3c632d9e32 Added option --no-merges to git summary 2021-08-07 17:31:49 +02:00
spacewander ffad35c8db git-summary: support filtering --line with path 2021-07-09 17:57:30 +08:00
Przemek Kitszel b8e58ee9ba Add git-abort 
New subcommand just calls git $op --abort, where $op is current git operation, like rebase
 2021-07-05 23:43:39 +02:00
Don Harper 64993dbc7f bin/git-fork | updating for feedback from PR #928 
Added support for pulling personal-access-token, borrowing from git-pull-request
 2021-06-04 20:08:07 -05:00
Don Harper 4a4c5296f3 git-fork | update to match REST-API auth standards as of 2021-06 
- Removed prompt for OATH Token
- Change prompt from 'password' to 'GitHub Personal Access Token'
 2021-06-03 20:19:56 -05:00
Vladimir Jimenez fb1e5db6d7
delete-squashed-branches: Make branch checkout side effect clear 2021-05-24 13:55:32 -07:00
Vladimir Jimenez 910242c92b
Add delete-squashed-branches command 2021-05-24 00:13:57 -07:00
Matan Rosenberg c35c84a279
Ignore checked-out branches on different worktrees 2021-04-20 09:49:23 +03:00
spacewander d0c40851c0 Bump version to 6.3.0-dev 2021-03-27 10:11:31 +08:00
spacewander b9786c763f Version 6.2.0 2021-03-26 11:09:34 +08:00
罗泽轩 6880198fda
Merge pull request #915 from spacewander/typo 2021-03-26 10:30:54 +08:00
罗泽轩 687a5607dc
Merge pull request #914 from spacewander/xch 2021-03-26 10:30:40 +08:00
spacewander 6a15a5339b fix(git-utimes): make sure it work under OS X. 2021-03-25 14:50:13 +08:00
spacewander a424d0915e chore: fix typo 2021-03-25 11:40:23 +08:00
spacewander 458727bafb fix(git-ignore): use $XDG_CONFIG_HOME only when it is defined 2021-03-25 11:31:11 +08:00
spacewander 16c1f0d3dc git-summary: reject invalid option 
Argument starts with '-' can't be committish, so we can safely reject
it.
 2020-12-16 18:01:30 +08:00
罗泽轩 e6caa931a5
Merge pull request #882 from vt-alt/git-utimes 
git-utimes: Change files modification time to their last commit date
 2020-11-29 11:40:12 +08:00
vanpipy d3772eb469 feat(feature): checkout from start point if exists 2020-11-19 09:16:37 +08:00
vanpipy 41732e4113 feat(create-branch): add optional --from to set the start point 2020-11-19 09:16:33 +08:00
Alessandro Pagiaro aa5a380996 Merge-into: add stash before to checkout 2020-11-16 11:33:59 +01:00
罗泽轩 68e6a15401
Merge pull request #892 from equt/#891 
[ fix #891 ] Cast branch output if HEAD not exists
 2020-11-14 10:19:04 +08:00
罗泽轩 05ce91fb9e
Merge pull request #888 from equt/master 
Add support for XDG specifications
 2020-11-14 10:17:53 +08:00
罗泽轩 d2a159ed25
Merge pull request #889 from vanpipy/feature/delete-tag 
feat(delete-tag): get default remote from git config if exists
 2020-11-12 09:19:00 +08:00
equt f66f7e484f
[ fix #891 ] Cast branch output if HEAD not exists 2020-11-11 22:38:19 +08:00
equt fca42774f8
[ feat ] Quote the default_path var 2020-11-11 22:30:10 +08:00
equt ef13ed06a3
[ fix ] Quote env var 2020-11-11 22:30:10 +08:00
equt fa35cdab99
[ fix ] Quote the XDG_CACHE_HOME 2020-11-11 22:30:10 +08:00
equt 8ed7da3f02
[ feat ] Use default global ignore file 2020-11-11 22:30:10 +08:00
Sinos 54f8205478
[ refactor ] Optimize var not existing check 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2020-11-11 22:30:10 +08:00
equt 19531065ca
[ fix ] Fix hardcode ignore list file path 2020-11-11 22:30:10 +08:00
equt 4f5b5ccd48
[ feat ] Add XDG_CACHE_HOME check 2020-11-11 22:30:09 +08:00
James Zhu 8490a50304 adding a format for git-contrib 2020-11-08 20:21:32 +08:00
Vitaly Chikunov aa174b3905 git-utimes: Change files modification time to their last commit date 
Signed-off-by: Vitaly Chikunov <vt@altlinux.org>
 2020-11-08 14:04:41 +03:00
vanpipy c006e5ece8 feat(delete-tag): get default remote from git config if exists 2020-11-08 10:41:50 +08:00
spacewander 3cc866dd97 Bump version to 6.2.0-dev 2020-09-28 17:47:23 +08:00
spacewander 2929c41637 Version 6.1.0 2020-09-26 20:11:50 +08:00
罗泽轩 64e76db350
Merge pull request #878 from spacewander/default_br 
change: migrate default branch
 2020-09-26 19:58:06 +08:00
spacewander 2e610158a8 git-info: fix regex for bsd sed 2020-09-24 23:10:23 +08:00
spacewander 9683fb6510 feat: pass origin argument down to git execution 2020-09-24 09:40:43 +08:00
spacewander 964663f1a4 change: migrate default branch 
Close #877.
 2020-09-23 16:19:41 +08:00
spacewander e116406ff1 git-back: removed 2020-08-28 22:23:41 +08:00
Yuriy VG 8e519e3e66 git-info: moved argument checking 2020-08-24 11:09:27 +03:00
Yuriy VG c52ba59d10 git-info: fix namespace 
should use 'git-extra' name to configure via git config options.
 2020-08-24 10:48:50 +03:00
Yuriy VG c92f03d303 git-info: colorized headers 2020-08-21 19:22:04 +03:00
Yuriy VG af06d49c33 git-info: extend configuration and commit information 
add ability to customize git-config, git-log commands from .gitconfig file
 2020-08-21 17:57:07 +03:00
Yuriy VG e7270b3667 git-info: remove notes about git-log, git-show 
auxiliary message distracting from the main message
 2020-08-21 16:14:54 +03:00
Yuriy VG 87cff6d5cb git-info: add info about submodules 2020-08-21 16:10:06 +03:00
Yuriy VG aaf9ef343b git-info: fix indentation, remove comment 2020-08-21 16:01:11 +03:00
vyas 73bb1e0f59 Remove $user 2020-08-06 13:06:28 +05:30
vyas 238038139d corrections 2020-08-06 13:03:13 +05:30
vyas a0d7039482 fix config message name 2020-08-05 16:22:44 +05:30
vyas 49a34037ad Remove comments 2020-08-05 16:19:51 +05:30
vyas 2dc9c26e36 PR test 2020-08-05 11:59:43 +05:30
罗泽轩 6e77d950eb
Merge pull request #853 from bethesque/feat/git-browse-with-multiple-remotes 
feat(browse): select remote of current branch, fallback to origin
 2020-07-27 09:24:28 +08:00
Beth Skurrie 572ae0dd46
feat(browse): automatically select origin remote if one exists, fallback to first otherwise 2020-07-26 08:22:43 +10:00
Beth Skurrie edf7b060d2
fix(browse): update sed pattern to work on mac 2020-06-23 09:31:21 +10:00
spacewander 2076ac9c38 Bump version to 6.1.0-dev 2020-06-22 21:31:49 +08:00
spacewander 4c9d59059e Version 6.0.0 2020-06-22 11:18:23 +08:00
spacewander a994411e58 git-cp: remove trailing space 2020-06-22 09:59:59 +08:00
vr8ce 27f42beb81 Tighten numeric regex 2020-06-19 22:56:55 -05:00
vr8ce 6ccd2fa439 Cleanup code 2020-06-18 23:38:55 -05:00
vr8ce 9dca93eeb2 Modify to work when only a single commit, add parameter checks 2020-06-17 20:11:07 -05:00
Caleb Maclennan db9ca55c71
Remove scripts that are mere alias wrappers for git-feature 
Notably `git-bug` clobbers a very popular other project of the same name.
Having lightweight wrapper scripts clogging up the subcommand namespace
makes it awkward to make use of this project wholesale instead of
piecemeal. These function can be implemented by users with git aliases
very easily.
 2020-05-30 15:32:01 +03:00
罗泽轩 852e630314
Merge pull request #840 from spacewander/archive-invalid 
git-archive-file: rename invalid chars in the output filename
 2020-05-27 09:14:57 +08:00
spacewander 8f133a32ba git-archive-file: rename invalid chars in the output filename 
Fix #838.
 2020-05-22 10:40:29 +08:00
罗泽轩 4eb4e7ffdb
Merge pull request #837 from jldugger/jldugger/pr-remote-default 
add a default for the remote to fetch a pr from
 2020-05-16 12:12:21 +08:00
Justin Dugger 9e843da98d add a default for the remote to fetch a pr from 2020-05-14 00:32:48 -07:00
Justin Dugger e8ee36733f add a config setting for prefix 2020-05-14 00:19:54 -07:00
Carlos Prado 63eaba4572 add squash option to git-feature 2020-04-04 00:27:58 +02:00
Rémy HUBSCHER 91b3e47243
Simplify the code. 2020-03-20 14:11:17 +01:00
Rémy HUBSCHER b85fc019ca
Signal if the destination already exists. 2020-03-20 09:43:24 +01:00
Rémy HUBSCHER 2c9b071fde
@spacewander review. 2020-03-20 09:37:43 +01:00
Rémy HUBSCHER bea25d1ceb
@mschneiderwind review. 2020-03-19 16:11:39 +01:00
Rémy HUBSCHER 629fc03581
Add first version of git-cp 2020-03-19 15:49:07 +01:00
Mark Pitman f6cf59c380 Implement suggested changes from code review 
Use bash string replacement instead of sed for simple replacement
Use http URLs instead of https (sites that reuqire https should be
auto-redirecting anyway)

 #666
 2020-03-17 21:12:07 -07:00
Mark Pitman 362a0c29ae Add git-browse command 
Handles git@server and https://server remotes.
Allows specification of the remote to open
Closes #666
 2020-03-15 01:40:09 -07:00
spacewander 3917c774ec change: deprecate git-back 
Thanks @vr8hub for the report.

git-back will be removed in the next next release.
 2020-02-23 11:41:54 +08:00
Brice Dutheil 80cd52701e
Fixes #770: Adds git-brv 2020-01-15 10:46:19 +01:00
spacewander 4b9f1619f6 git-sed: limit paths via pathspec 2020-01-03 18:22:34 +08:00
spacewander 6438dee914 Bump version to 5.2.0-dev. 2019-12-23 18:28:13 +08:00
spacewander 2a65a7aa8b Version 5.1.0 2019-12-21 13:53:03 +08:00
spacewander 2067d26276 git-bulk: support cloning from a relative path 2019-12-21 13:35:59 +08:00
spacewander aefa3c9ff6 git-standuo: clarify the -a option 2019-12-21 13:12:10 +08:00
spacewander 3b2f6611d6 git-paste: check pastebinit before running it 
We don't force to install pastebinit because it is not widely used in
git-extras.
 2019-12-20 22:08:02 +08:00
spacewander ecff5e1a3c git-coauthor: quote variable in the comparison 2019-12-20 18:22:06 +08:00
spacewander eb33c9bf5a git-bulk: don't disappoint shellcheck 2019-12-20 18:21:29 +08:00
spacewander 4d5b53aea2 git-sed: escape special characters for tr 
Some special patterns like `n-l`, `[:alpha:]` need to be escaped to avoid
confusing tr.
 2019-12-16 22:19:30 +08:00
Roshak Zarhoun 16bb0df9f9 add repositories to workspace from source (#804) 
* make addworkspace clone multiple repositories into ws from list of URLs in a file

* extend usage

* check if source is file or URL

* update Commands.md

* checked allwedargcount function

* resolved merge conflicts and change requests

* update manuals

* change the order of error and usage in allwedargcount()

* improve URL matcher. include also SSH protocol
 2019-12-10 21:57:32 +08:00
Christophe Badoit 41ebe0e0bf git-ignore: support non-default .git directory 
useful for submodules.

Closes tj/git-extras#807
 2019-12-06 17:23:19 +01:00
罗泽轩 29f6d0e0e0
Merge pull request #802 from spacewander/fix-git-bulk-arg-count 
fix bug in allowedargcount() to not execute command if wrong args count
 2019-12-05 18:26:57 +08:00
roxchgt 45647fdab3 fix bug in allowedargcount() to not execute command if wrong args count 2019-12-01 11:33:59 +08:00
罗泽轩 67c2bf595f
Merge pull request #801 from spacewander/fix-delete-submodule 
git-delete-submodule: don't remove the history of deleted submodule
 2019-12-01 11:31:22 +08:00
spacewander 4d4b87ccb8 git-delete-submodule: don't remove the history of deleted submodule 
This hurted 'git blame' and other git operation which relies on history.

Fix #799.
 2019-11-29 17:43:22 +08:00
Tom Andrade 704b1b4fdd Add flags -s and -u for signed tags 2019-11-26 08:31:06 +01:00
罗泽轩 a6a1754093
Merge pull request #795 from spacewander/git-squash-commit-msg 
Git squash commit msg
 2019-11-05 18:12:43 +08:00
罗泽轩 b0d3a77ac0
Merge pull request #793 from spacewander/git-standup-group-by-branch 
git-standup: add option '-B' to group the commits by branch
 2019-11-05 17:57:49 +08:00
spacewander f4e313d3f2 git-squash: clean up shellcheck warnings 2019-11-05 10:30:37 +08:00
spacewander 1924eb9197 git-squash: add --squash-messages to concat commit messages into one. 2019-11-05 10:28:51 +08:00
spacewander 952d1eb76f git-standup: add option to limit the number of commit 2019-11-04 11:36:29 +08:00
spacewander 677f570f34 git-delete-submodule: comment the DUMMY prefix and ignore the output of grep -v. 2019-11-03 11:30:03 +08:00
spacewander 227c19bb67 git-standup: add separate newline between the output 2019-11-03 10:53:40 +08:00
go2null 1f605df053 add PR changes 2019-11-02 04:32:36 -04:00
go2null 17d1a471a4 add --force option to continue on error 2019-11-02 04:32:36 -04:00
go2null f00c1389d6 improve readability 2019-11-02 04:32:36 -04:00
go2null 4f35f8cad8 display git submodule status output before exiting 2019-11-02 04:32:36 -04:00
go2null 5ea4a626a6 check git submodule status before declaring success 2019-11-02 04:32:36 -04:00
go2null 4bb273a802 reorganize flow 2019-11-02 04:32:36 -04:00
go2null 4a47ea034b delete empty .gitmodules 2019-11-02 04:32:36 -04:00
spacewander 7b9fbc4389 git-standup: add option '-B' to group the commits by branch 2019-11-01 17:32:55 +08:00
spacewander f788c789f3 git-summary: clean up other shellcheck warnings 2019-10-31 18:30:46 +08:00
spacewander 3e8c3ab0c4 git-summary: fix incorrect active days when commits range is given 
Previous when commits range is given, we count the active days of whole
history because we didn't pass the argument.
 2019-10-31 17:56:41 +08:00
spacewander ff991ac99e git-summary: remove useless result function. 
This function was introduced when merging `bin/git-line-summary` into
`bin/git-summary`.
 2019-10-31 17:56:41 +08:00
spacewander 203f5b48ad git-summary: add --dedup-by-email to remove duplicate users 2019-10-27 09:04:27 +08:00
Robin von Bülow 256044c04f
Use GIT_DIR environment variable to to set .git directory 2019-10-02 12:42:14 +02:00
spacewander 7015501161 git-effort: adjust column limit according to the paths 
Fix #780.
 2019-09-24 14:32:54 +08:00
Paul Wise 5b62b4a884
Add git-paste for sending patches to pastebin 2019-09-10 10:39:20 +08:00
Paul Wise 1d7d4c2446
Switch from using /tmp to using mktemp 
mktemp protects against attacks from other users.
mktemp protects against concurrent writers.
mktemp respects the $TMPDIR environment variable.

Suggested-by: check-all-the-things
 2019-09-05 12:41:45 +08:00
Paul Wise 1a414f5512
Fix typos 
Suggested-by: codespell
Suggested-by: spellintian
 2019-09-05 12:41:38 +08:00
罗泽轩 a56e14488e
Merge pull request #772 from jacobherrington/add-git-coauthor 
Add git coauthor command
 2019-08-28 18:06:24 +08:00
jacobherrington 55cefa9021 Add conditional logic for linebreaks 2019-08-27 10:52:44 -05:00
jacobherrington 3484df9ca4 Ensure arguments exist 2019-08-23 20:30:18 -05:00
jacobherrington 66288296b2 Add git coauthor command 
This adds a feature to add additional authors to the previous commit,
this feature is supported by GitHub and GitLab and based on the format
should be self-evident to anyone reading the commit message.
 2019-08-23 20:21:43 -05:00
spacewander a2250dd205 Bump version to 5.1.0-dev. 2019-08-18 10:49:54 +08:00
spacewander ebdebadd3b Version 5.0.0 2019-08-16 22:33:27 +08:00
spacewander d4de567ca7 git-line-summary: should be the history 
Also remove some trailing lines after the output.
 2019-07-23 22:13:29 +08:00
Brice Dutheil 2dc5d5104e git-guilt: protect against encoding issues with LC_ALL=C 2019-07-18 15:37:47 +02:00
spacewander df06f3e3bd git-rename-branch: change branch argument order 
Now git-rename-branch has the same order like 'git branch -m', 'git
rename-tag' and other rename command.

Note that this is a break change.

Close #759.
 2019-07-06 11:41:47 +08:00
罗泽轩 ac9e35735b
Merge pull request #762 from spacewander/pr_merge 
git-pr: add -m|--merge option to check out a merge commit
 2019-06-22 10:54:34 +08:00
Brian Murrell 7d3ab83ec3 implements remote pref for create-branch 2019-06-21 06:20:16 -07:00
spacewander eae05bbb98 git-pr: add -m|--merge option to check out a merge commit 
Close #757.
 2019-06-17 11:15:12 +08:00
brian murrell 820b7cd41b impl for checking remote pref 2019-06-14 01:35:52 -07:00
spacewander c3c0bdfbbb git-fork: prompt for password before 2FA code. 
Fix #750.
 2019-06-02 12:20:09 +08:00
timfeirg ecdd665f1c
git-mv-remote: rename a remote regardless of any existing remotes 2019-05-08 14:08:20 +08:00
罗泽轩 044b06b6cb
Merge pull request #723 from bittner/feature/git-undo-soft-leave-changes-staged 
Make `git undo -s` restore the staging area
 2019-03-04 19:31:16 +08:00
spacewander eecfb9af47 git-guilt: avoid exceeding 80 columns. 2019-02-18 13:11:26 +08:00
spacewander 39df4dfa64 Bump version to 4.8.0-dev. 2019-02-09 17:36:46 +08:00
spacewander f355fb4c94 Version 4.7.0 2019-02-09 17:08:42 +08:00
spacewander f29dad042c git-pr: accpeted multiple GitHub URL or ID with remote. 2019-02-02 12:29:41 +08:00
spacewander 87b7c959b4 git-pr: added <[remote]:pr number> option. 2019-02-02 11:45:27 +08:00
单元源 9f806bb828 feat: Add -s(--soft) for git sync 
feat: Add readme for man page and helper

fix: Remove git-sync.1.html
 2019-01-16 11:38:35 +08:00
Stu Feldt 3730339067 Adding support for symlink directories in bulk command 2018-12-10 11:07:49 -06:00
Sebastián Mancilla 13fa83b24e git-standup: ensure color usage 
Git may fail to detect that the tty supports colors and fallbacks to
non-colored output.

This overrides that by specifying the color parameter.

Based on kamranahmedse/git-standup#84
 2018-11-20 14:44:40 -03:00
Orestis 7393fb41ed
git-rename-branch: Don't fail if remote doesn't exist 
Allows the command to work correctly with local branches.

Closes #535
 2018-09-13 15:15:03 +03:00
Peter Bittner b7d507567b Make git undo -s restore the staging area 2018-08-17 16:22:54 +02:00
spacewander 2590998ee0 Bump version to 4.7.0-dev. 2018-08-11 11:33:30 +08:00
spacewander 8545d97b8d Version 4.6.0 2018-08-11 09:57:41 +08:00
spacewander a347e49178 git-changelog: should remove ^0 suffix from the commit description. 2018-08-08 13:34:11 +08:00
spacewander 792b697450 git-changelog: add --start-commit option, like --start-tag but for commit 2018-06-16 12:20:08 +08:00