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

643 commits

Author SHA1 Message Date
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
spacewander b7a1a0d8b2 git-changelog: add missing newline to the plain output 
Previously, running "git changelog -x --start-tag 4.5.0 -p -l" will see

* Bump version to 4.6.0-dev.  * Version 4.5.0

Because there is no newline in the end of each plain output.
 2018-06-15 18:14:18 +08:00
Richard Russon f30005acfd optimisation of mkdir 2018-05-25 11:16:14 +01:00
Richard Russon 691d640b2d Ensure info dir exists 2018-05-25 10:12:27 +01:00
Richard Russon 0f76863d9b add: git-ignore -p (private to repo) 2018-05-23 23:59:21 +01:00
罗泽轩 d34b6ae0bc
Merge pull request #714 from spacewander/fix_detect_sed_i_support 
git-sed: fix previous bsd sed workaround
 2018-05-16 14:38:10 +08:00
Tjaart van der Walt 658f133691 Major/Minor release should reset minor/patch versions to 0 
There is a bug in the current version:

```
version=1.1.3
./git-release --semver minor
version=1.2.3
```

The correct behavior should be:

```
version=1.1.3
./git-release --semver minor
version=1.2.0
```
 2018-05-07 15:00:39 -07:00
Tjaart van der Walt 6f416b20c3 Fix greedy match of version number 
The original regex will greedily match the first digit of version
numbers that have multiple digits.
 2018-05-07 14:44:35 -07:00
spacewander f7514bebbf git-sed: fix previous bsd sed workaround 2018-05-07 15:18:28 +08:00
spacewander 0ab9b47371 git-sed: detect sed -i support and work around for the BSD sed 2018-05-05 10:57:57 +08:00
Paul Wise 9785199036
git-sed: discover a separator when the / character is used in arguments 
Prevents sed from returning an error for arguments containing filenames:

$ git sed src/foo.c src/bar.c
sed: -e expression #1, char 13: unknown option to `s'
 2018-04-26 11:07:07 +08:00
Paul Wise c27a3505dc
git-sed: pass the -r option to the xargs command 
Prevents running sed when the search pattern does not match any files.

This results in sed printing an unnessecary warning:

$ git sed foo bar
sed: no input files
 2018-04-26 11:06:34 +08:00
Paul Wise ee14220f66
git-sed: Allow the flags to be passed as a third argument 
This is more in-line with how sed itself works.
 2018-04-20 11:29:54 +08:00
Montak Oleg fd2151f9bb Fix deleting branches without upstream 2018-03-25 00:10:59 +03:00
spacewander ebf7903d0e Bump version to 4.6.0-dev. 2018-02-18 18:58:16 +08:00
spacewander 4ab42e218e Version 4.5.0 2018-02-18 11:56:35 +08:00
spacewander e9ddc1dc3b git-release: show message if nothing given after --semver 2018-02-18 11:37:23 +08:00
罗泽轩 9ee318e8d4
Merge pull request #639 from spacewander/avoid_deleting_local_upstream 
git-delete-branch: avoid deleting local upstream
 2018-02-15 12:23:29 +08:00
spacewander de364cfac1 git-release: add --no-empty-commit for empty commit hater 2018-02-11 20:12:10 +08:00
spacewander 8714ac4aa1 git-release: create an empty release commit if there is nothing to commit 2018-02-11 20:12:10 +08:00
罗泽轩 d4bf79df8f
git-summary: unescape tab for linux column utility 
git-summary: unescape tab for linux column utility

Linux column utility will escape tab if a separator is specified.
This problem is first reported in Fedora 27.
 2018-02-08 22:34:43 +08:00
spacewander 16591d3788 git-undo: add confirmation when -h is specified 2018-02-07 10:37:55 +08:00
Dominic Barnes 5639160b8b feat(git-release): push tags first to help ci tools not miss them 
If you are buliding on CircleCI for example, pushing the commits first
can lead to a race where CI env will not see the tags since the pull
happened before the tags were finished pushing.

It should be fully safe (and backwards-compatible) to change the order
of pushing to the remote.
 2018-01-23 13:51:44 -08:00
spacewander ab99fb3eb2 git-release: handle extra non-numeric prefix in tag with --semver 2017-12-12 10:10:37 +08:00
spacewander 693c84f8f0 git-release: add --semver option 2017-12-10 14:06:00 +08:00
spacewander 199364e932 git-release: function usage doesn't exist, ignore unknown argument instead 2017-12-07 00:29:07 +08:00