Commit graph

537 commits

Author SHA1 Message Date
spacewander b8ea5c4a02 fix git-extras update and tweak Windows detection
Replace expr with bash substring expansion.
Tested under:
GNU bash, version 4.3.42(5)-release (x86_64-pc-msys)
GNU bash, version 3.2.57(1)-release (x86_64-apple-darwin16)
2016-12-07 10:39:53 +08:00
罗泽轩 82162ea8c8 Merge pull request #585 from tardypad/stamp
Add git stamp
2016-12-05 20:13:50 +08:00
罗泽轩 15ae263312 Merge pull request #578 from tardypad/count_fix_extra_arguments
count: remove usage of extra arguments for detailed display
2016-12-05 09:49:03 +08:00
Damien Tardy-Panis a118f306b1 stamp: remove non used multiple lines error messages 2016-12-04 16:21:09 +01:00
Damien Tardy-Panis 4aec48c85c stamp: the message consists in all terms after the identifier
no need to put quotes in case of spaces
2016-12-04 16:21:09 +01:00
Damien Tardy-Panis c9463bf6ef stamp: identifier is case insensitive for the replacement 2016-12-04 16:21:09 +01:00
Damien Tardy-Panis b105dd837a stamp: add replace option
replace all previous stamps with same identifier in commit message
2016-12-04 16:18:54 +01:00
Damien Tardy-Panis 3ffbe23fbe stamp: display new full message as result 2016-12-04 16:18:54 +01:00
Damien Tardy-Panis 79629e6b6e stamp: add extra optional message parameter 2016-12-04 16:18:54 +01:00
Damien Tardy-Panis cd328bfb61 stamp: add basic script 2016-12-04 16:18:54 +01:00
罗泽轩 76694bccdd Merge pull request #601 from richardfearn/git-sed-spaces-in-filenames
git-sed: use "grep -z" and "xargs -0" to cope with spaces in filenames
2016-11-20 10:38:46 +08:00
hemanth.hm 29a5596d9e Merge pull request #603 from richardfearn/git-clear-consistent-defaults
git-clear-soft: change default yes/no option to "no" (as with git-clear)
2016-11-20 05:16:22 +05:30
Richard Fearn c4a9bb46d9 git-clear-soft: change default yes/no option to "no" (as with git-clear)
6d49449 changed the git-clear default option to "no" (see #583).

Make the git-clear-soft default the same - it's safer.
2016-11-19 17:53:51 +00:00
Richard Fearn 8cbbf9095a git-delete-merged-branches: use "xargs -r" to prevent error when there are no branches to delete
Prevents this error:

    $ git delete-merged-branches
    fatal: branch name required
2016-11-19 17:41:30 +00:00
Richard Fearn 2292e1cebe git-sed: use "git grep -z" and "xargs -0" to cope with spaces in filenames
Otherwise filenames with spaces result in errors:

    $ cat "file with spaces in name"
    old

    $ git sed old new
    sed: can't read file: No such file or directory
    sed: can't read with: No such file or directory
    sed: can't read spaces: No such file or directory
    sed: can't read in: No such file or directory
    sed: can't read name: No such file or directory
2016-11-19 17:26:17 +00:00
罗泽轩 fd2de52949 Merge pull request #600 from richardfearn/git-fresh-branch-fix
git-fresh-branch: fix handling of 'yes' response when there are changes
2016-11-20 01:25:30 +08:00
Richard Fearn 4f8e411f71 git-fresh-branch: fix handling of 'yes' response when there are changes
'break' isn't valid in its current location in the script, resulting in an
error like:

  /usr/bin/git-fresh-branch: line 42: break: only meaningful in a `for', `while', or `until' loop

Since there's a call to 'clean' right at the end of the script, do nothing if
anything beginning 'Y' or 'y' is entered; execution will continue to the end
of the script, and 'clean' will be called.
2016-11-19 16:59:58 +00:00
Richard Fearn 82d6a7265f git-{clear,clear-soft,sync}: improve yes/no prompts
Don't print trailing newline; prompt for yes/no response on the same line
2016-11-19 16:41:19 +00:00
Richard Fearn 009f4fb6d1 git-sed: fix 'unkonwn' typo 2016-11-19 14:03:21 +00:00
spacewander b89c12e79b show all commit messages if no tag found 2016-11-05 14:33:16 +08:00
spacewander e101d825a2 strip out branches like trap-effort-signals 2016-11-05 12:10:03 +08:00
Robin Winslow 71a12810e0 Be explicit about only resetting git directories
This expects a target git directory. If it's not a git directory,
(e.g. a simple directory) then it will pass through to
`git clone` which will raise an error.

Here I'm clarifying that this tool will reset local *git directories* specifically.
2016-10-29 17:24:18 +01:00
Robin Winslow 5550cfa4dc Fix branch option parsing
Needs an extra `shift`, to remove the second option as well.
2016-10-29 16:23:28 +01:00
Robin Winslow 6e87dc3e55 Fix usage 2016-10-29 16:18:09 +01:00
Robin Winslow 2137124977 Use LC_ALL=C for locale consistency 2016-10-29 16:16:18 +01:00
Robin Winslow ad5365fb53 Remove unnecessary check 2016-10-29 16:16:04 +01:00
Robin Winslow e476562a46 git-force-clone
All files for git-force-clone, a command for overwriting local repos when closing repositories.
2016-10-28 22:23:47 +01:00
Brian Goad 7ff05f2977 Need to remove the temp file regardless 2016-10-21 14:05:44 -04:00
spacewander 1b84048bfc Add --no-email to git-author
This feature is used to generate AUTHORS in 4.2.0 release.
2016-10-12 14:37:45 +08:00
spacewander 805d43831f Bump version to 4.3.0-dev. 2016-10-08 14:04:14 +08:00
spacewander 91aa82b62b Version 4.2.0 2016-10-08 13:52:34 +08:00
grindhold 6d49449a4d fixes #583
put default option in security-answer to 'no'
2016-09-23 22:38:27 +02:00
Damien Tardy-Panis fae4c29870 count: remove usage of extra arguments for detailed display
When viewing detailed count information through the usage of the
--all argument, extra arguments would be also passed to the
git shortlog command (probably to be used as revisions list)
This behaviour was introduced in commit 7a60cd1.

Unfortunately the --all argument itself is passed along and results
in the counts of all refs to be displayed
This commit removed the usage of extra arguments and thus only
display the counts of the current branch
2016-09-12 13:46:25 +02:00
R. Martinho Fernandes 241069ddac Make git-pr set up branch for pulling (#570)
With these changes, the pr/nn branches created by git-pr also support `git pull` to get PR updates.
2016-09-11 09:12:41 +05:30
Hozefa 5a8ce5e364 add rename-branch command (#576) 2016-09-11 09:11:32 +05:30
William Montgomery 554d779344 Add built in 'exit' command to git-repl 2016-08-11 15:45:51 -04:00
Nicolai Skogheim ebe7448e67 pull-request: should read local config if present 2016-08-07 09:43:07 +02:00
Nicolai Skogheim 20b84f5b17 git-missing: do proper argument parsing. Fix #562 2016-08-06 03:04:01 +02:00
Nicolai Skogheim 5d15928e82 Merge pull request #563 from lukechilds/improve-fork
git-fork: use ssh remotes if possible
2016-08-04 14:13:55 +02:00
Luke Childs c87d59346b Set fork remotes using ssh if available 2016-08-03 13:06:56 +01:00
Damien Tardy-Panis 9b3e25f407 Add git reauthor (#548)
Based on https://help.github.com/articles/changing-author-info/
2016-08-02 19:41:56 +02:00
hemanth.hm 76f23c213d Merge pull request #561 from lukechilds/improve-json-encoding
Improve JSON encoding
2016-07-30 15:11:30 +05:30
Luke Childs 82b6eb4331 Clean up git-pull-request 2016-07-30 10:36:14 +01:00
Luke Childs a3c03d021e Improve JSON encoding 2016-07-30 00:50:39 +01:00
Luke Childs 27e992b260 Fix incorrect comment in git-fork 2016-07-29 23:55:20 +01:00
spacewander 66560432ce add doc for git-pull-request and others 2016-07-29 11:39:39 +08:00
spacewander b33f85a5d1 follow common shebang 2016-07-28 22:24:40 +08:00
Yi EungJun dbf87bf94e fork: Fetch origin after forking 2016-07-26 11:17:30 +09:00
Yi EungJun 6e65f37392 fork: Rename 'origin' to 'upstream' after forking 2016-07-26 01:22:30 +09:00
Yi EungJun 76663c26db fork: Fork 'origin' remote repo if repo is not given 2016-07-26 00:01:06 +09:00