Commit graph

779 commits

Author SHA1 Message Date
overengineer 3f2ad3fa8f Ignored error when git restore --staged fails when there is no commit 2021-10-08 07:36:29 +03:00
overengineer e0101470ca Merge branch 'master' into merge/magic 2021-10-08 07:15:16 +03:00
overengineer 86bb1a6764 Added git-magic command 2021-10-08 07:05:50 +03:00
spacewander 96890821b0 Bump version to 6.4.0-dev 2021-10-03 21:25:29 +08:00
spacewander 0c0be92445 Version 6.3.0 2021-10-02 13:25:45 +08:00
spacewander 760e64b864 git-delete-squashed-branches: fail fast if can't checkout 2021-10-01 20:04:28 +08:00
Simon Tate bc8876b063 git-clear: add force option
Add a new -f/--force option to git-clear to allow usage in scripts,
or without user input.

Add -h/--help/? for help

Also update the manual for git-clear for these changes.
2021-09-14 13:45:50 +01:00
罗泽轩 4de7b34c9f
Merge pull request #937 from tfendin/dedup_email_case_insensitive
Compare email adresses case insensitive in --dedup-by-email
2021-08-17 08:59:46 +08:00
罗泽轩 0edcf8b7e6
Merge pull request #934 from tfendin/no-merge-summary
No merge summary
2021-08-17 08:59:30 +08:00
Tobias Fendin 5feb0db212 Adopted git --dedup-by-email to the project coding style 2021-08-14 14:44:21 +02:00
Tobias Fendin 703a8481c6 summary --dedup-by-email now compares email adresses case insensitive. 2021-08-12 22:05:22 +02:00
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