Paul Wise
a6732ef6db
Remove some trailing whitespace
2018-05-09 10:20:46 +08:00
罗泽轩
3802e83e79
Merge pull request #715 from tjaartvdwalt/master
...
Fix bugs with git-release --semver
2018-05-08 10:27:42 +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
罗泽轩
d024755718
Merge pull request #712 from spacewander/detect_sed_i_support
...
git-sed: detect sed -i support and work around for the BSD sed
2018-05-05 11:22:00 +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
罗泽轩
4325238aee
Merge pull request #709 from pabs3/git-sed
...
Improve the git-sed command
2018-05-03 17:30:06 +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
罗泽轩
1b94ca130c
Merge pull request #706 from MontakOleg/delete-branch
...
Fix deleting branches without upstream
2018-03-25 14:16:53 +08:00
Montak Oleg
fd2151f9bb
Fix deleting branches without upstream
2018-03-25 00:10:59 +03:00
罗泽轩
6add6488d7
Merge pull request #704 from ramlev/master
...
Remove double path delimiters in zsh description
2018-03-22 17:06:41 +08:00
Hasse Ramlev Hansen
22a44eb206
Remove double path delimiters in zsh description
2018-03-22 06:56:36 +01:00
罗泽轩
420c678526
Merge pull request #703 from psprint/master
...
Installation.md: Zsh-plugin method which doesn't require root access
2018-03-02 16:05:55 +08:00
Sebastian Gniazdowski
c53edf00da
Installation.md: Zsh-plugin method which doesn't require root access
2018-03-01 16:39:59 +01: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
spacewander
f5d99bcac9
doc: update git-extras index
2018-02-15 22:57:56 +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
罗泽轩
5dbab48aff
Merge pull request #693 from xakraz/fix-mktemp-pattern
...
Fixed mktemp template to support busybox (and Alpine linux)
2018-02-11 20:26:23 +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
Xavier Krantz
80e93704eb
Fixed mktemp template to support busybox (and Alpine linux)
2018-02-05 12:33:18 +01:00
罗泽轩
8216e6bbbc
Merge pull request #691 from koppor/patch-1
...
Remove trailing dot of German Windows
2018-02-05 11:25:53 +08:00
Oliver Kopp
f959b4d4d3
Remove trailing dot of German Windows
2018-02-04 13:04:25 +01:00
罗泽轩
db2d0456ac
Merge pull request #690 from dominicbarnes/release-push-tags-first
...
feat(git-release): push tags first to help ci tools not miss them
2018-01-25 10:32:50 +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
罗泽轩
c2efbc889d
Merge pull request #687 from spacewander/add_semver
...
git-release: handle extra non-numeric prefix in tag with --semver
2017-12-14 18:40:41 +08:00
spacewander
ab99fb3eb2
git-release: handle extra non-numeric prefix in tag with --semver
2017-12-12 10:10:37 +08:00
hemanth.hm
17fce79d3c
Merge pull request #686 from spacewander/add_semver
...
git-release: add --semver option
2017-12-10 12:34:05 +05:30
spacewander
693c84f8f0
git-release: add --semver option
2017-12-10 14:06:00 +08:00
hemanth.hm
b7d960eadb
Merge pull request #684 from spacewander/ignore_unknown_arg
...
git-release: function usage doesn't exist, ignore unknown argument instead
2017-12-08 10:41:31 +05:30
spacewander
199364e932
git-release: function usage doesn't exist, ignore unknown argument instead
2017-12-07 00:29:07 +08:00
hemanth.hm
3b21b87036
Merge pull request #681 from EdwardBetts/master
...
Fix so 'git rebase-patch' is described once.
2017-11-26 12:57:30 +05:30
Edward Betts
fc8eaf0d28
Fix so 'git rebase-patch' is described once.
2017-11-26 06:31:22 +00:00
罗泽轩
6aecc2b9fa
Merge pull request #680 from lhernanz/master
...
Preserve existing user commands in zsh completion
2017-11-15 15:12:08 +08:00
Luis Miguel Hernanz
43bc038d41
Preserve the existing user_commands in the git completion system
2017-11-14 22:57:50 -08:00
罗泽轩
82896c8553
Merge pull request #679 from spacewander/update_git_changelog_doc
...
Mention how to control changelog format in docs of git-changelog
2017-11-13 14:18:37 +08:00
罗泽轩
f1aeed4344
Merge pull request #678 from timhwang21/devs/thwang/docs-update
...
Docs> Add -- in front of cmd for git log
2017-11-10 19:58:36 +08:00
spacewander
46bc0959e1
Mention how to control changelog format in docs of git-changelog
2017-11-10 11:20:08 +08:00
Timothy Hwang
167f0c8b50
Docs> Add -- in front of cmd for git log
...
The current docs are incorrect, using the command gives an error msg:
```
error: unknown argument --since=1 week ago
error: if that argument was meant for git-log,
error: please put it after two dashes ( -- ).
```
2017-11-09 13:54:54 -05:00
罗泽轩
e7ca960f0c
Merge pull request #676 from gormac/master
...
Fix 'Invalid code page' error when restoring code page at end of script for Windows
2017-11-03 16:38:09 +08:00
Marco Glasbergen
d520e0641e
Fix 'Invalid code page' error when resetting code page at end of script
2017-11-03 09:00:51 +01:00
罗泽轩
9573a7653b
Merge pull request #675 from quite/effort-cursor
...
git-effort: restore normal (visible) cursor properly
2017-10-27 20:18:47 +08:00
Daniel Lublin
af39b2b2ee
git-effort: restore normal (visible) cursor properly
...
If I understand GNU* correctly, cnorm should be used to undo `civis` (make
invisible). `cvvis` is just another abnormal mode, namely "very visible".
*) https://www.gnu.org/software/termutils/manual/termutils-2.0/html_chapter/tput_1.html
2017-10-27 10:30:17 +02:00
hemanth.hm
78835c7525
Merge pull request #674 from tj/pull-request-two-factor-auth
...
Add GitHub two factor auth support to git-pull-request
2017-10-22 06:02:55 +05:30
