Commit graph

1272 commits

Author SHA1 Message Date
罗泽轩 3b7637ce40
Merge pull request #732 from sachin-gupta/sg-mods
Fix: Dev: `/E` option required to install on Win 10 {b17134} or higher
2018-10-16 21:45:26 +08:00
Sachin Gupta edebba89b9 Fix: Dev: /E option required with MORE for working on higher version of Windows 10 (**_Build 17134_**)
Changes:
- Added small text line to debug files being written iff environment variable `%DEBUG%` is `true`
- Added option `/E` to both MORE commands used inside install.cmd for copying files.
2018-10-09 14:07:05 +05:30
罗泽轩 8b992cc9bc
Merge pull request #729 from orestisf1993/patch-1
git-rename-branch: Don't fail if remote doesn't exist
2018-09-13 22:29:07 +08: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
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
罗泽轩 424ec4d2a5
Merge pull request #727 from spacewander/strip_caret
git-changelog: should remove ^0 suffix from the commit description.
2018-08-10 00:00:58 +08:00
罗泽轩 1cb4979ed7
Makefile: change the installed manpage destination in FreeBSD (#725) 2018-08-09 10:06:18 +08:00
spacewander a347e49178 git-changelog: should remove ^0 suffix from the commit description. 2018-08-08 13:34:11 +08:00
罗泽轩 e4aaf9f697
Merge pull request #722 from spacewander/git_changelog_start_commit
git-changelog: add --start-commit option, like --start-tag but for commit
2018-06-20 15:41:51 +08:00
spacewander 792b697450 git-changelog: add --start-commit option, like --start-tag but for commit 2018-06-16 12:20:08 +08:00
罗泽轩 4e1cd73e59
Merge pull request #721 from spacewander/git_changelog_list_newline
git-changelog: add missing newline to the plain output
2018-06-16 10:04:02 +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
罗泽轩 d681b972cc
Merge pull request #713 from pabs3/docs
Updates to the documentation building workflow and docs
2018-05-30 13:49:18 +08:00
罗泽轩 28819e388e
Merge pull request #717 from flatcap/ignore-private
add: git-ignore -p (private to repo)
2018-05-25 19:34:47 +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
罗泽轩 a4f85ae6ff
Merge pull request #716 from francoism90/patch-1
Add installation guide for Arch Linux
2018-05-21 11:35:20 +08:00
François M 787ee2c997
Added Arch Linux
Link to packages, since Arch Linux may use an AUR helper.
2018-05-20 14:31:47 +02: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
Paul Wise f5c26c7fb3
Documentation rebuild: git-sed.* flags argument
Reflects changes in commit ee14220f66
2018-05-09 17:16:52 +08:00
Paul Wise 731e9d8db9
Documentation rebuild: git-clear.html whitespace removal
Reflects changes in commit a6732ef6db
2018-05-09 17:16:52 +08:00
Paul Wise 8b58e570cb
Documentation rebuild: git-extras.* updates
Re-orders git-clear/git-clear-soft and git-lock/git-locked due to
differences between the sorting by make and shell.
2018-05-09 17:16:52 +08:00
Paul Wise ba6d991851
Documentation rebuild: index.txt updates
Removes most index.txt whitespace because whitespace is insignificant in
ronn index.txt files and POSIX shell makes it hard to use the right amount.

Re-orders git-clear/git-clear-soft and git-lock/git-locked due to
differences between the sorting by make and shell.
2018-05-09 17:16:52 +08:00
Paul Wise bd6a1fcafe
Documentation rebuild: dates and headers
Adds "Git Extras" to all the headers.
Updates all the dates to the last modification.
2018-05-09 17:16:52 +08:00
Paul Wise 317e546b0a
Remove one of the documentation building tools
The two methods build slightly different manual pages.

The Makefile based version has better headers so use it.

Automatically generate git-extras.md and index.txt when building docs.
2018-05-09 17:16:49 +08:00
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
spacewander f7514bebbf git-sed: fix previous bsd sed workaround 2018-05-07 15:18:28 +08: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