Commit graph

868 commits

Author SHA1 Message Date
罗泽轩 81665422b2
Merge pull request #974 from tfendin/970-standup-author-date
#970 standup added -A flag for author date
2022-07-04 10:40:19 +08:00
Tobias Fendin bf240df083 Replaced -g and -A with -F gpg|authordate 2022-06-26 12:49:43 +02:00
Peter Benjamin 7acc1de7fa
fix(bin/git-browse): fix commit hash
Retrieving commit hashes with the following command is not very reliable for
users who sign their commits with gpg/ssh keys:

```
git log -n1 --format=format:"%H" "${filename}" 2>/dev/null
```
2022-06-09 19:44:02 -07:00
Peter Benjamin 8a6e39d589
fix(bin/git-browse): fix bitbucket url 2022-06-09 19:32:47 -07:00
Peter Benjamin 006549d661
feat: open website at file & line number or range
Ported from
f544dadf88/git/bin/git-browse

Closes #980
2022-06-09 19:26:55 -07:00
Tobias Fendin 233b3f0dd4 #970 standup added -A flag for author date 2022-05-14 15:17:58 +02:00
Bill Wood 34237934d4 update per shellcheck advice 2022-05-10 19:42:12 -04:00
罗泽轩 458cb9fdad
Merge pull request #966 from tfendin/git-standup-implicit-week
Added config git-extras.standup-implicit-week for git standup
2022-05-09 13:06:33 +08:00
Tobias Fendin 0701c9e4d7 Don't read git-extras.standup.implicit-week twice in git standup 2022-05-07 12:31:16 +02:00
Bill Wood 42fd8a9e72 quote mod_s and git_s integer vars 2022-05-06 08:33:30 -04:00
Bill Wood 311edadd55 Merge branch 'master' of https://github.com/wpwoodjr/git-extras 2022-05-05 11:21:41 -04:00
Bill Wood d8dd44d8eb
Merge branch 'tj:master' into master 2022-05-05 11:21:07 -04:00
Bill Wood 41df8dc7f3 updates per request of spacewander 2022-05-05 11:19:30 -04:00
罗泽轩 5e07a96c57
Merge pull request #965 from tfendin/document-git-standup-w
Document git standup -w option
2022-05-05 11:03:53 +08:00
Bill Wood 799aa6e19a allow modification date updates for symbolic links 2022-05-01 22:01:57 -04:00
Bill Wood aa6b547f55 add --newer flag and ignore files in the working tree or index 2022-05-01 16:48:57 -04:00
Tobias Fendin 745c7ab500 Improved check if -w or -d was given to git standup 2022-04-29 11:04:04 +02:00
Tobias Fendin 7cb5c55e13 Renamed config git-extras.standup.implicit-week from
git-extras.standup-implicit-week
2022-04-29 09:56:26 +02:00
spacewander d2a09c1753 Bump version to 6.5.0-dev
Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2022-04-27 21:06:07 +08:00
Tobias Fendin c7756455cb Added config git-extras.standup-implicit-week for git standup 2022-04-26 15:45:59 +02:00
Tobias Fendin 4fcd233bf2 Document git standup -w option 2022-04-26 15:24:43 +02:00
spacewander a73c19c14b Version 6.4.0
Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2022-04-22 16:32:01 +08:00
spacewander d17f02979e git-browse/browse-ci: use powershell.exe only when it is available
Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2022-04-19 20:51:22 +08:00
罗泽轩 716459f79d
Merge pull request #944 from SimonTate/feature/sem-ver-prefix
git-release: Add prefix to semver
2022-04-18 15:06:34 +08:00
罗泽轩 02263ca949
Merge pull request #957 from jackwasey/quiet-or-stderr
quiet option, errors to stderr
2022-04-18 15:06:04 +08:00
Simon Tate 613b909765 git-release: Add prefix to semver
To allow different release names other than specifically mm.vv.pp, this
adds the ability to use a prefix too.

For example, you can use:

```
$ git release --semver minor --prefix "prefix-"
```

This would allow the previous tags to be in the form `prefix-0.1.0`. A
more obvious use case for this would be a single letter, such as `v` or
`r` to use tags like: `r0.1.0` or `v0.1.0`.
2022-04-15 13:13:02 +01:00
罗泽轩 f556430122
Merge pull request #959 from pbnj/feat/git-browse-ci
feat: implement git-browse-ci
2022-04-13 20:14:53 +08:00
Peter Benjamin 9390d450aa fix: fix stderr & stdout redirect 2022-04-11 08:51:21 -07:00
spacewander 27ee8f0132 git-ignore-io: make sure .gi_list is created before access 2022-04-08 21:08:52 +08:00
spacewander 678a0c2e71 git-ignore: the directory of target file may not exist
Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2022-04-08 21:08:29 +08:00
Peter Benjamin 11a2801231 fix(git-browse-ci): set pipefail 2022-03-20 18:53:05 -07:00
Peter Benjamin f513f58d9e feat: implement git-browse-ci 2022-03-19 19:39:03 -07:00
Jack O. Wasey c036c9cc22 quiet option, errors to stderr 2022-03-17 13:25:02 -04:00
Tobias Fendin b2794c18a1 Removed xargs from git-effort 2022-02-25 16:45:54 +01:00
Tobias Fendin 7aa178acc9 Made local-commits work with all remotes 2022-01-03 16:45:09 +01:00
罗泽轩 b772251074
Merge pull request #949 from tfendin/git-ignore-ensure-newline 2022-01-03 21:24:34 +08:00
tfendin fff5fde917
Clarified comment of when newline should be added
Co-authored-by: 罗泽轩 <spacewanderlzx@gmail.com>
2021-12-30 12:47:29 +01:00
Tobias Fendin 11640196b2 git-ignore: ensure new patterns comes after a newline 2021-12-29 15:07:19 +01:00
Tobias Fendin 6b0ef19caf Fixed bug in git-ignore which ignored config core.excludeFiles 2021-12-29 14:33:28 +01:00
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
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