Commit graph

1602 commits

Author SHA1 Message Date
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
罗泽轩 2370a4e27b
Merge pull request #885 from spacewander/add_pkg 2021-11-26 12:47:16 +08:00
spacewander 2fdd664594 doc: add packaging status 2021-11-23 09:40:20 +08:00
罗泽轩 b33ec65e5f
Merge pull request #940 from overengineer/feature/magic
git-magic: Automated commit messages
2021-10-10 12:09:51 +08: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
罗泽轩 cc9b972e25
Merge pull request #942 from spacewander/ffgd 2021-10-02 13:06:40 +08:00
spacewander 760e64b864 git-delete-squashed-branches: fail fast if can't checkout 2021-10-01 20:04:28 +08:00
罗泽轩 f6fa554077
Merge pull request #939 from SimonTate/feature/force-clear
git-clear: add force option
2021-09-16 15:16:20 +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
罗泽轩 c30ac80d72
Merge pull request #936 from tfendin/multiline_synopsis_fix
Format fix of Synopsis in manuals
2021-08-19 11:27:18 +08: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 3413eeb058 Updated lines under Synopsis in the manuals so they are commonly formatted 2021-08-11 17:33:01 +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
罗泽轩 a07c5ece5d
Merge pull request #935 from ax1036/git-un-lock
fix git (un)lock with spaced filenames
2021-08-11 21:22:48 +08:00
ax1036 296f2a7ad2 fix git (un)lock with spaced filenames 2021-08-10 14:17:33 +02:00
Tobias Fendin e9708ba9f4 Updated completion for git summary 2021-08-07 17:31:51 +02:00
Tobias Fendin 3c91de7a1e Updated documentation for git-summary --no-merges 2021-08-07 17:31:51 +02:00
Tobias Fendin 3c632d9e32 Added option --no-merges to git summary 2021-08-07 17:31:49 +02:00
罗泽轩 3821b2c537
Merge pull request #932 from spacewander/git-su
git-summary: support filtering `--line` with path
2021-07-22 10:51:02 +08:00
spacewander ffad35c8db git-summary: support filtering --line with path 2021-07-09 17:57:30 +08:00
罗泽轩 d28ad34bcb
Merge pull request #865 from pkitszel/pkitszel-git-abort 2021-07-08 15:00:15 +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
罗泽轩 b225ed4934
Merge pull request #928 from duckunix/master 2021-06-09 21:03:33 +08:00
Don Harper 30383f9551 Update point to github docs for forks from API 2021-06-07 20:12:22 -05:00
Don Harper 1f72512ef0 update working 2021-06-06 21:26:01 -05:00
Don Harper b8b02d8ef1 git-fork | Update man/md/html pages to talk about need of the github personal access token 2021-06-04 23:04:31 -05:00
Don Harper d8b1007f68 Updated documentation (AUTHORS) 2021-06-04 20:12:41 -05: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
罗泽轩 206fe7ccfb
Merge pull request #926 from nicokosi/patch-1 2021-06-02 09:40:28 +08:00
Nicolas Kosinski f1eab6a8a7
Update install doc: Homebrew is not just for macOS
I can confirm it also works Linux. I just installed `git-extras` via `Homebrew` on my Ubuntu machine:
```sh
$ uname -srv
Linux 5.8.0-53-generic #60~20.04.1-Ubuntu SMP Thu May 6 09:52:46 UTC 2021

$ brew install git-extras
Updating Homebrew...
==> Auto-updated Homebrew!
Updated 2 taps (homebrew/cask and homebrew/core).
==> New Formulae
code-minimap              principalmapper           pywhat
==> Updated Formulae
Updated 70 formulae.
==> Updated Casks
Updated 36 casks.

==> Downloading https://ghcr.io/v2/linuxbrew/core/git-extras/manifests/6.2.0
######################################################################## 100.0%
==> Downloading https://ghcr.io/v2/linuxbrew/core/git-extras/blobs/sha256:5a86
==> Downloading from https://pkg-containers.githubusercontent.com/ghcr1/blobs/
######################################################################## 100.0%
==> Pouring git-extras--6.2.0.x86_64_linux.bottle.tar.gz
==> Caveats
To load Zsh completions, add the following to your .zshrc:
  source /home/linuxbrew/.linuxbrew/opt/git-extras/share/git-extras/git-extras-completion.zsh
==> Summary
🍺  /home/linuxbrew/.linuxbrew/Cellar/git-extras/6.2.0: 146 files, 388.4KB
```
2021-06-01 14:58:26 +02:00
罗泽轩 cd8fe4f6e2
Merge pull request #924 from allejo/feature/delete-squashed-branches 2021-05-27 20:13:41 +08:00
Vladimir Jimenez bebcbd11ca
delete-squashed-branches: Make side-effect clear in docs 2021-05-25 20:50:04 -07: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
罗泽轩 48b2c8fd37
Merge pull request #923 from CleanMachine1/patch-1 2021-05-24 12:16:20 +08:00
CleanMachine1 d86abec6a2
Picture is broken 2021-05-22 19:57:11 +01:00
罗泽轩 1894f453f6
Merge pull request #920 from matan129/patch-1 2021-04-22 15:16:20 +08:00
Matan Rosenberg c35c84a279
Ignore checked-out branches on different worktrees 2021-04-20 09:49:23 +03:00
罗泽轩 a62a67ef5f
Merge pull request #917 from heirecka/remove-git-line-summary-man-page
doc: Remove man page for git-line-summary
2021-03-27 10:21:50 +08:00
spacewander d0c40851c0 Bump version to 6.3.0-dev 2021-03-27 10:11:31 +08:00
Heiko Becker 52ada403ef doc: Remove man page for git-line-summary
git line-summary was deprecated in favour of git summary --line and
removed with d4de567ca7.
2021-03-26 23:59:33 +01:00