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

868 commits

Author SHA1 Message Date
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
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
spacewander a88958ba20 Add GitHub two-factor auth support to git-pull-request 2017-10-18 10:47:17 +08:00
Sam Bostock 6b5f5d8762 Use local variables & format strings 2017-10-14 13:31:31 -04:00
Sam Bostock 18d8221dd2 Fix omission when alphabetically printing ignores 
Iterating through `a..z` omits entries starting with other characters.
 2017-10-09 23:18:18 -04:00
Sam Bostock cfcb4d92c6 Remove arbitrary column limit on ignore-io 2017-10-09 23:08:12 -04:00
spacewander 4defd6d676 Bump version to 4.5.0-dev. 2017-07-16 12:37:58 +08:00
spacewander be8a1548d4 Version 4.4.0 2017-07-15 16:25:54 +08:00
spacewander 227ef26e7f git summary: use more common way to cd to top level directory 2017-07-15 09:57:57 +08:00
Mark Pitman c064956f85 Use "$@" instead of $@ 2017-07-11 23:37:16 -07:00
Mark Pitman a75411b029 Consolidate feature/bug/chore/refactor logic 
Remove unneccesary code
 2017-07-11 21:42:02 -07:00
Mark Pitman 93150aa411 Allow -r parameter to be in any order in command line 2017-07-11 21:41:06 -07:00
Mark Pitman 61b2a2c703 Add ability to specify a remote 
Use -r to push the new branch to origin
Use -r <remote_name> to push to <remote_name>

Will not auto push to origin if you do not use the argument
 2017-07-09 01:57:46 -07:00
Mark Pitman be15db9cdf Fix Issue #186 
Use `git create-branch` instead of `git checkout -b` in:
git-bug
git-chore
git-feature
git-refactor

Since `git-finish` uses `git-delete-branch` (which expects the branch to
have been pushed to origin) we should use `git-create-branch` to create
it.
 2017-07-07 23:19:02 -07:00
spacewander 4d885acda0 fix various typos 2017-06-18 20:22:11 +08:00
Étienne BERSAC d4c7581835
Add git-mr to checkout GitLab merge requests 2017-06-16 11:11:50 +02:00
Andreas Duering 9baae93a9b Fix typo in git-extras 
Output said "Setting up 'git-exras" instead of "Setting up 'git-extras"
 2017-05-16 15:12:45 +02:00
hemanth.hm 9334c9db31 Merge pull request #654 from spacewander/replace-xargs-r 
git-delete-merged-branches: replace xargs -r option
 2017-05-09 14:49:55 +05:30
spacewander 0e7cba55a8 git-delete-merged-branches: replace xargs -r option 2017-05-09 10:48:45 +08:00
spacewander 276a307780 Bump version to 4.4.0-dev. 2017-05-06 14:45:15 +08:00
spacewander 88ee400c3f Version 4.3.0 2017-05-05 16:50:41 +08:00
spacewander f55690e702 git-authors: remove trailing spaces 2017-05-05 16:02:09 +08:00
罗泽轩 204406bd29 Merge pull request #649 from adriaanzon/patch-1 
git-fork: Let curl exit with error code on fail
 2017-05-05 16:00:39 +08:00
spacewander 27310926d3 git-release: add pre-release failure message 2017-05-03 09:54:17 +08:00
spacewander 3428b278d3 git release: stop if pre-release hook fails 2017-05-02 14:59:18 +08:00
Daniel Bruder b41a4cf05b pass release arguments to pre/post-release scripts 
With some modification to catch up with latest situation.
Signed-off-by: spacewander <spacewanderlzx@gmail.com>
 2017-05-02 14:35:03 +08:00
Adriaan Zonnenberg bd8545f748 git-fork: Let curl exit with error code on fail 2017-04-27 18:44:20 +02:00
Sean Molenaar 14159245a9 Add BSD cat support 
on macOS cat doesn't support the long operator
 2017-04-21 15:37:48 +02:00
spacewander 684d6acc93 git-standup: add sanity check to -d option and overwrite -w option 2017-04-12 23:39:58 +08:00
spacewander 0b91cd9bae git-standup: upgrade interface to catch up with kamranahmedse/git-standup 2017-04-12 14:17:25 +08:00
罗泽轩 61211634c9 Merge pull request #642 from nschlimm/git-bulk-command 
Git bulk command
 2017-04-01 10:40:08 +08:00
Niklas Schlimm fe39ac8af2 Corrected repository location print out and docs ws-root-directory absolute path 2017-03-30 19:31:32 +02:00
Niklas Schlimm ca62bdcfe6 Codereview Spacewander - whitespaces in workspace locations 2017-03-29 17:34:39 +02:00
Niklas Schlimm 7263b6c611 Review from spacewander 2017-03-28 21:52:21 +02:00
J.C. Yamokoski 6eb04bcca8 Remove slashes from git-config command 
These slashes were causing the branch to be saved in `.git/config` with headings
such as `[branch "\"pr/123\""]` as opposed to `[branch "pr/123"]`. This in turn
prevented these entries from being removed when running `git pr clean`.
 2017-03-28 09:44:40 -04:00
Niklas Schlimm de15bf7fb0 Merge branch 'master' into git-bulk-command 2017-03-19 19:49:08 +01:00
罗泽轩 49771ba018 Merge pull request #636 from spacewander/fix_rename_branch 
use remote detected instead of 'origin' in rename-branch
 2017-03-19 20:52:48 +08:00
spacewander 4a05ad29e4 git-rename-branch: use detected upstream remote 2017-03-19 02:00:11 +08:00
spacewander 344b145062 git-pull-request: use detected upstream remote 2017-03-19 01:31:44 +08:00
spacewander 9744830d4a git-delete-branch: avoid deleting local upstream 2017-03-18 22:13:57 +08:00
Niklas Schlimm 02dc8b5b21 Better behaviour in non workspace directories 2017-03-17 17:33:53 +01:00
Niklas Schlimm d3cccebbd2 Current workspace is default target of bulk operations 2017-03-17 17:13:15 +01:00
Niklas Schlimm 9260fd92bf Even shorter 2017-03-13 21:06:50 +01:00
Niklas Schlimm 5957544dee Code refactor 2017-03-12 16:15:09 +01:00
Niklas Schlimm 9263aec739 bug fix in single ws mode 2017-03-08 20:26:44 +01:00
Niklas Schlimm 1cc77481bd code formatting 2017-03-08 20:11:26 +01:00
Niklas Schlimm 534c72b91f Fix in git-bulk head 2017-03-08 19:58:34 +01:00
Niklas Schlimm 57c0eb776c New Command git-bulk initial commit 2017-03-08 19:50:36 +01:00
spacewander cc0dff2f49 fix syntax & name variables better in rename-branch 2017-03-07 14:39:50 +08:00
Niklas Schlimm 422c9a8e69 taken out duplicate columns setting 2017-03-05 16:06:47 +01:00
Niklas Schlimm b01359efc5 Optimized file length calculation 2017-03-04 14:21:26 +01:00
Niklas Schlimm 518db6e648 Columns in git-effort adopt to file length 2017-03-04 13:59:48 +01:00
Dan Kilman b2c7de9a5a Fix git-effort for paths starting with dash 2017-02-14 23:57:19 +02:00
Justin Dugger c80b4e773f fall back to EMAIL when user.email is not configured 2017-02-01 20:36:34 -08:00
Nicolai Skogheim e93f206bad Merge pull request #619 from spacewander/git-summary-separator 
use U+266A instead of comma as separator
 2017-01-31 11:32:56 +01:00
Andrew Griffiths 2451c0c202 Adds SSH prompt to git fork 2017-01-25 10:32:49 +00:00
spacewander bb5f4b0234 use U+266A instead of comma as separator 2017-01-24 14:13:38 +08:00
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
Stefan VanBuren fece2a517a Fix typo 2016-07-12 13:23:03 -04:00
spacewander 09bbb56a39 fix git-fork by removing '.git' 2016-06-27 19:43:07 +08:00
spacewander 34f5245672 fix the support for forking via ssh 2016-06-27 14:00:37 +08:00
hemanth.hm 1f374d1ea9 Merge pull request #412 from spacewander/git-obliterate 
update git obliterate
 2016-06-02 05:56:08 +05:30
spacewander a39c89e34e Update the way to delete submodule 2016-05-17 17:20:03 +08:00
Matiss 61fee79cc7 Add git-clear-soft command 
Modify git-clear to indicate default behavior of removing git ignored files
 2016-05-01 19:05:21 +02:00
hemanth.hm e7826a717c Merge pull request #513 from lgastako/master 
Add -m flag to git-setup to set the initial commit message.
 2016-04-20 21:45:36 +05:30
spacewander c43d4f2539 add git-standup 2016-04-14 15:40:11 +08:00
John Evans 555282985d Add -m flag to git-setup to set the initial commit message. 2016-03-03 01:12:19 -05:00
Lee Wei 56a2e27910 Merge pull request #1 from tj/master 
Update with the upstream
 2016-02-16 11:30:22 +08:00
LeeW 3603b67eb7 Fix ignore-io searching bug 2016-02-16 11:17:04 +08:00
Nimit Kalra 8a8a483f41 Bump version to 4.2.0-dev. 2016-01-24 15:07:09 -06:00
Nimit Kalra 0ca4c6f221 Version 4.1.0 2016-01-24 15:04:10 -06:00
spacewander a192fe688a handle GIT_EDITOR which contains space 2016-01-20 18:48:19 +08:00
spacewander afce25cd65 use ps -f and awk to emulate pgrep 
There is no pgrep in git for windows
 2016-01-20 11:39:25 +08:00
Takuma Yamaguchi f0ecd82129 add upstream check & bugfix 2016-01-17 00:56:45 +09:00
Takuma Yamaguchi 3481ff245e upstream is used by default 2016-01-16 01:40:10 +09:00
Takuma Yamaguchi 12e416a324 add git-sync 2016-01-14 00:19:12 +09:00
Nimit Kalra 39ed77253c Bump version to 4.1.0-dev. 2015-12-29 00:03:19 -06:00
Nimit Kalra 94556f380b Version 4.0.0 2015-12-28 22:42:20 -06:00
David Rogers 2b042bdd59 Better USAGE message 2015-12-28 14:07:09 -05:00
David Rogers 64639e1437 Touch multiple files supplied 2015-12-28 14:06:30 -05:00
David Rogers 3c874ce9f4 Use $@ instead of $* re #467 
Blind first pass so that I have a PR to remind me...
 2015-12-28 13:53:49 -05:00
Andrew Janke a09eefde25 Fix missing shebang in git-clear and missing +x on others 2015-12-27 15:02:55 -05:00
hemanth.hm 35e1f7845a Merge pull request #479 from JanSchulz/global_gitignore 
Add more info how to set global gitignore
 2015-11-03 07:47:46 +05:00
hemanth.hm 1d8534b9cd Merge pull request #448 from Lee-W/master 
Add git-ignore-io
 2015-10-28 10:15:40 +05:30
Jan Schulz b4f4dd1197 Add more info how to set global gitignore 2015-10-22 11:28:17 +02:00
Nimit Kalra b804d36a21 Merge pull request #471 from JanSchulz/merge-changelog 
git-changelog: option to only use merges
 2015-10-18 13:22:30 -05:00
Jan Schulz 5a80928b89 git-changelog: option to only use merges 
using `-m` or `--merges-only` will only show the merge
commit messages. It will also use the body of the merge
commit message in addition to the subject, as github merges
usually have a useless subject line for commit messages.

If used with `-n/--no-merges`, the last one specified will win.
 2015-10-18 16:11:10 +02:00
spacewander 7f662708fa use real purplish 2015-10-13 23:54:52 +08:00
hemanth.hm f799e96910 Merge pull request #466 from anarcat/master 
add simple sed command
 2015-10-10 09:43:36 +05:30
Antoine Beaupré 4b795fc42f add simple sed command 2015-10-08 16:13:27 -04:00
spacewander 77f1c86b0d disable color if the output is not printed to tty 2015-10-08 16:45:53 +08:00
spacewander 02a440953b replace wildcard '?' to literal '?' 
Previously the `?` in the case statement will match any single letter.
As a result, `git scp a` will act as the same as `git scp -h`.
What we actually need is a literal '?'.
 2015-10-08 14:06:46 +08:00
spacewander 7ae2e0b9ef git-scp: use portable terminal escape sequences 2015-10-08 10:24:31 +08:00
hemanth.hm c4cd2ca34d Merge pull request #460 from apjanke/summary-defensive-locale 
git-summary: protect against character encoding issues with LC_ALL=C
 2015-10-02 22:05:27 +05:30
Andrew Janke 19f66943cb git-summary: protect against character encoding issues with LC_ALL=C 2015-10-02 08:35:04 -04:00
Andrew Janke b2817c7299 git-effort: use portable terminal escape sequences 
Also uses "default color" instead of "black" for the low-activity things, so
it still shows up on colorschemes that have dark backgrounds.
 2015-10-02 06:35:38 -04:00
Johannes Ewald 7b74567550 Add possibility to also checkout pull requests based on GitHub urls 2015-09-24 16:11:06 +02:00
Akim Demaille 5f61bfad6e summary: beware of locale issues, and pass options to line-summary 
* bin/git-summary: here.
 2015-09-23 19:27:19 +02:00
hemanth.hm 332bec0f1a Merge pull request #443 from Natim/patch-1 
Make sure git-authors doesn't return twice the same ones.
 2015-09-22 11:44:40 +05:30
LeeW 37d6012791 Replace "export" option with "replace" in git-ignore-io 2015-09-19 09:54:53 +08:00
LeeW 07505518fa Remove exclamation mark 2015-09-19 01:00:31 +08:00
LeeW 88c3437a24 Remove warning when search without word. 
* Show usage only
 2015-09-19 00:42:23 +08:00
LeeW b517022e15 Fix typo 2015-09-19 00:37:38 +08:00
LeeW 8d0eae5c7f Add warning when there is not argument after search, append and export 2015-09-17 21:32:10 +08:00
LeeW 61bfc44eec Fix ~/.gi_list not exist problem 2015-09-17 21:19:45 +08:00
Sam Thursfield 6a000ec99b effort, summary: Correctly estimate the number of active days 
The output of `git log` is not exactly in chronological order. The
default sort option (--date-order) is described in the man page as
follows:

    Show no parents before all of its children are shown, but otherwise
    show commits in the commit timestamp order.

The `uniq` program will only remove duplicate lines if they follow each
other. In order for this to work correctly, we need to ensure that the
list of dates is exactly in chronological order. There doesn't seem to
be a `git log` option to achieve this, but we can use the `sort`
program. I used reverse sort (`sort -r`) since the output will be roughly
reverse-sorted already.

It's also worth noting that the default --date-order option sorts by
commit date, but git-summary uses *author* date (%ai). Passing
--author-date-order doesn't fix this issue, though, so I didn't change
that.

At the time of writing, this change reduces the number of 'active days'
for git-extras.git from 367 to 331.
 2015-09-14 13:32:10 +01:00
hemanth.hm c8aca55cd7 Merge pull request #445 from nicolaiskogheim/straighten-up-effort 
Straighten up effort
 2015-09-14 14:55:54 +05:30
Nicolai Skogheim 80f060b213 effort: change order of arguments to function 
This makes git effort less prone to failing if
someone passes formatting options
 2015-09-14 00:00:39 +02:00
Nicolai Skogheim e91fd9623f effort: add usage message 2015-09-13 23:56:56 +02:00
Nicolai Skogheim 86e1a7014c effort: More robust argument parsing 
Why:

* The old way of handling arguments could make it
difficult to make non-breaking changes because
to be able to handle more arguments than the
'--above' argument, the logic would need to be heavily
refactored and demand restrictions on argument order.

This change addresses the need by:

* Parse arguments in a cleaner way
* Make the command more future proof with respect to arguments

Notable change is the synopsis. Please the see man page.
 2015-09-13 23:55:28 +02:00
LeeW 490d12b6f7 Add full name for list option 2015-09-12 08:15:29 +08:00
LeeW 0393d560f8 Fix usage error 2015-09-12 08:04:47 +08:00
Rémy HUBSCHER 639210660e Make sure git-authors doesn't return twice the same one. 2015-09-11 20:14:36 +02:00
spacewander 38c7b03372 add alias to git-feature 2015-09-11 20:23:17 +08:00
LeeW 2c1d766640 Modify print_last_modified_time to make it Linux compatible 2015-09-09 18:42:28 +08:00
LeeW 6073594656 Remove redundant \n in tr 2015-09-08 20:59:08 +08:00
LeeW fed97bf8db Not to update list each time git-ignore-io is executed 
* Check whether the list exists. If not, get it.
* Update should use -u option manually
 2015-09-08 20:57:06 +08:00
LeeW 3ad2f6fa4a Refactor git-ignore-io and remove .gitignore 2015-09-08 20:23:53 +08:00
spacewander a7f830b1e7 remove duplicate checkout 2015-09-08 16:08:50 +08:00
LeeW 98bbfe7968 Fix typo 2015-09-07 22:20:20 +08:00
LeeW 4a8037fa62 Implement search function or git-ignore-io 2015-09-06 22:49:32 +08:00
LeeW d87599c344 Remove help from git-ignore-io 2015-09-06 22:18:29 +08:00
LeeW 87d61693b1 Merge gi_extension project into git extras as git-ignore-io 
* gi_extension(https://github.com/Lee-W/gi_extension)
 2015-09-06 19:58:17 +08:00
grindhold a66c9446b5 made more precise security-question. 2015-09-01 15:17:14 +02:00
grindhold dae38840f9 more concise implementation of git-clear 2015-09-01 13:28:29 +02:00
Nicolai Skogheim 0c7bf665f2 Fix typo in variable name 2015-08-29 15:31:10 +02:00
grindhold ad7811e991 implemented git-clear 
i wanted a simple command to restore the state of a repo as if it was
freshly cloned with the current HEAD. This is basically git reset --hard
with deletion of all untracked files that are in the repo.
 2015-08-26 21:58:22 +02:00
hemanth.hm afb905c5ae Merge pull request #430 from spacewander/git-extras 
make it possible to update via `git extras`
 2015-08-16 09:28:41 +05:30
luozexuan 5fb7f6b77c make it possible to update via git extras 2015-08-16 11:47:16 +08:00
hemanth.hm ad83e447a6 Merge pull request #429 from nicolaiskogheim/merge-into-ff-only 
merge-into: change --ff option to --ff-only
 2015-08-14 17:12:05 +05:30
Nicolai Skogheim 2d8b703e7c merge-into: change --ff option to --ff-only. fix #421 2015-08-14 13:03:39 +02:00
hemanth.hm 17b82ec9ee Merge pull request #411 from Natim/add-psykorebase-command 
Add the git-psykorebase command.
 2015-08-11 16:02:39 +05:30
Rémy HUBSCHER 84699acc6e Add documentation. 2015-08-11 11:26:52 +02:00
hemanth.hm 3632ad959f Merge pull request #426 from spacewander/update-for-new-version 
abort git-alias when too many arguments given.
 2015-08-09 17:21:42 +05:30
spacewander 98a1820d39 abort git-alias when too many arguments given. 
Avoid incorrect usage probably because of the missing quotes, like "git
alias cm checkout master"
 2015-08-09 19:27:49 +08:00
hemanth.hm ad75f873af Merge pull request #423 from nicolaiskogheim/effort-paths 
effort: document that it takes any path, not just filenames
 2015-08-08 20:46:25 +05:30
Nicolai Skogheim 4527656f7c effort: rename 'file' to 'path' to be more accurate 2015-08-08 09:06:54 +02:00
Nicolai Skogheim 7de280f12f effort: fix active days always 1 
Introduced in cdb773c06 (Fix error on FreeBSD with process substitution)
when trying to squash a bug.
This fix should be valid for that bug as well.
 2015-08-08 02:44:55 +02:00
hemanth.hm 2113e8c1d7 Merge pull request #419 from nicolaiskogheim/git-guilt 
[RFC] guilt: small fixes
 2015-08-07 16:43:09 +05:30
Nicolai Skogheim ff4ad92a7a line-summary: 'function f{...' -> 'f() {...' 
We use this style more often
 2015-08-07 08:36:56 +02:00
Nicolai Skogheim 40023f9f14 line-summary: add missing quotation marks 2015-08-07 08:36:56 +02:00
Nicolai Skogheim b9ca124980 line-summary: tighten regex 2015-08-07 08:36:56 +02:00
Nicolai Skogheim 8b4e50f74a guilt: remove --help option 
git overrides execution when --help is given,
showing the man page for the command
 2015-08-07 08:35:32 +02:00
Nicolai Skogheim 8f1729d5f7 fork: http-urls had colon instead of slash 2015-08-05 04:27:32 +02:00
spacewander 94bf129721 now we can specify a commit range for git-obliterate 2015-08-01 20:39:02 +08:00
Rémy HUBSCHER d8395ba2e9 Create a bash version of git-psykorebase — Fixes #411 2015-07-31 16:22:58 +02:00
hemanth.hm 3c5523617e Merge pull request #409 from nicolaiskogheim/refactor-alias 
Refactor alias
 2015-07-29 17:51:23 +05:30
Nicolai Skogheim 24ad1c8281 alias: bugfix 
'git alias <search-term>' did not work.
 2015-07-29 13:15:34 +02:00
Nicolai Skogheim 4b4276e3fc contrib: refactor, and conform to git 2015-07-29 12:03:45 +02:00
hemanth.hm 371dcdff13 Merge pull request #405 from nicolaiskogheim/fix-filenames-with-spaces 
Make git effort not crash when passed file names with spaces
 2015-07-29 13:36:24 +05:30
hemanth.hm 46db56905d Merge pull request #404 from nicolaiskogheim/freebsd-fix 
Make git effort run on FreeBSD
 2015-07-29 13:36:00 +05:30
NANRI 22406cef6a git-alias: use sed insted of colrm 
PortableGit doesn't have colrm command.
 2015-07-29 08:39:07 +02:00
NANRI 5e14c08fc5 git-changelog: use cp instead of mv 
mv command cannot overwrite in PortableGit(msysgit).
 2015-07-29 08:27:30 +02:00
NANRI 434b7681ce git-extras: use git-help instead of man 
PortableGit doesn't have man command.
 2015-07-29 08:23:25 +02:00
Nicolai Skogheim 526fb77823 Quote variables bc of filenames with spaces 2015-07-29 05:10:52 +02:00
Nicolai Skogheim 1956d385bd Guard against 'seq 0' 
Most implementations of seq yields no output for 'seq 0',
but some yields '1(newline)0'.
 2015-07-28 21:23:50 +02:00
Nicolai Skogheim cdb773c065 Fix error on FreeBSD with process substitution 2015-07-28 20:41:53 +02:00
Nicolai Skogheim 20e6455559 Pass --import-functions if required 
This patch is the reason for this commit:
https://lists.freebsd.org/pipermail/svn-ports-all/2014-September/075090.html
 2015-07-28 06:13:59 +02:00
hemanth.hm f40e6c37a6 Merge pull request #401 from nicolaiskogheim/effort-above-error-on-NaN 
effort: error out on bad value to --above
 2015-07-25 13:05:00 +05:30
Nicolai Skogheim 6ebfdc5329 effort: error on bad value to --above 2015-07-25 09:09:39 +02:00
hemanth.hm d97faf2424 Merge pull request #400 from nicolaiskogheim/fix-off-by-one 
effort: don't count untouched files
 2015-07-25 12:17:34 +05:30
hemanth.hm 651a2bac97 Merge pull request #391 from nicolaiskogheim/effort-limit-commits 
[RFC] effort: Allow sending options to log. Fix #326
 2015-07-25 11:52:06 +05:30
hemanth.hm 3dcf09f883 Merge pull request #398 from nicolaiskogheim/git-graft 
graft: Require destination branch. Fix #23
 2015-07-25 11:50:43 +05:30
Nicolai Skogheim 95db4e7ad5 archive-file: cleaner way to get current branch 2015-07-25 06:09:43 +02:00
Leila Muhtasib 3d0b4feb80 graft: Require destination branch. Fix #23 
This is to avoid the old behaviour of automatically
merging into master.
 2015-07-25 04:16:09 +02:00
Nicolai Skogheim 329106c845 effort: don't count untouched files 2015-07-25 03:16:18 +02:00
Nicolai Skogheim ba5e5989a3 Do proper argument parsing 2015-07-24 18:57:34 +02:00
Nicolai Skogheim fd72edd98f effort: allow sending options to log. Fix #326 2015-07-23 01:15:10 +02:00
Amir Tocker 7ddd1f7a60 Catch "HEAD -> master" when creating the changelog 
git log may report `(HEAD -> master, tag:...)` instead of `(HEAD, tag:...)`.
 2015-07-20 09:38:14 +03:00
hemanth.hm 8652172f9b Merge pull request #394 from markeissler/changelog-signal-trap 
Handle signals in git-changelog.
 2015-07-16 09:25:45 +05:30
Mark Eissler 4ff5dc1ee0 Remove unused var. 2015-07-15 08:34:06 -07:00
Mark Eissler 4fd095b741 Handle signals in git-changelog. 2015-07-10 18:11:18 -07:00
Nicolai Skogheim a7064395c2 Meke coloring respect --above. Fix 74 2015-07-10 03:29:09 +02:00
Nicolai Skogheim 935c5a37b3 Avoid spawning subshell 2015-07-08 18:59:10 +02:00
Nicolai Skogheim 39238ded46 Remove unnecessary call to cat 2015-07-08 18:56:00 +02:00
Nicolai Skogheim 203b7649a2 perf: reduce calls to git log 2015-07-08 18:52:51 +02:00
Nicolai Skogheim 73973049d6 Parallelize git-effort with xargs 2015-07-08 18:45:41 +02:00
Nicolai Skogheim cb15c94eab Alter options to git log. Remove pipe 2015-07-08 17:58:12 +02:00
Rico Sta. Cruz 13842de9e0 Use https for git-fork 2015-06-23 12:57:30 +08:00
spacewander 51fbc16913 installation with curl and bash 2015-06-08 00:09:40 +08:00
spacewander 84c2d1014b keep installation silent 2015-06-07 20:57:39 +08:00
spacewander a498332c96 update installation in git-extras update 2015-05-30 12:31:23 +08:00
go2null a67b42711d FIXes location of -- for grep 
Broken in 5b1ac3ccc6

`--` must be after all parameters (options), and before positional arguments

See https://unix.stackexchange.com/questions/11376/what-does-double-dash-mean-also-known-as-bare-double-dash
 2015-05-28 11:59:29 +00:00
phigoro 95e8812370 git-effort: replace "wc | cut" with "wc | awk" 
It looks "cut" may have different behaviour, e.g. BSD one works the way
git-effort doesn't expect. "awk" looks to be one of possible fixes here.
 2015-05-11 19:54:38 +03:00
phigoro 09d967dfbd align hashbang of git-guilt & git-merge-into 2015-05-10 12:01:38 +03:00
Newell Zhu 72f08b1095 Fix Fatal for git-line-summary 
1. Fix print format with special characters
2. Fix Fatal when exist special characters in git blame output
3. Fix raise error when exist not committed new files
 2015-05-09 17:07:29 +08:00
Rob Kennedy e2b6eaf028 Don't treat ignored patterns as regexps 
Fixes #353.
 2015-04-29 22:48:16 -07:00
Hemanth.HM 438de98926 Version 3.0.0 2015-04-27 17:43:50 +05:30
CJ 62dd4a2258 Updated documentation for git-scp and slight feature change 2015-04-27 15:05:17 +08:00
Mark Eissler 399bc037fa Fix git tag substring extraction for bash 3.2. 2015-04-25 10:12:17 -07:00
hemanth.hm e16e90e9b9 Merge pull request #360 from spacewander/master 
correct the broken regex
 2015-04-25 21:44:15 +05:30
spacewander 2810323aad add support for git version below 2.2.0 2015-04-24 12:00:17 -07:00
Mark Eissler 80d680b0a6 Fix git-changelog for compatibility for bash<4. Fixes #337, #338 
Removed dependency on real associative arrays, which are not
support previous to bash 4.
 2015-04-24 12:00:17 -07:00
spacewander b4a1fe0aa3 correct the broken regex 
'*text' only matches string ended with 'text'. So it matches 'ASCII text',
but does not match 'ASCII text executable'. Before, `git summary
--line` just counts plain text file, now we fix it.
 2015-04-24 23:13:16 +08:00
Ivan Malopinsky 05b0a5d3d5 git-merge-repo 2015-04-19 12:23:02 -04:00
spacewander b375870693 fix indentation errors in git guilt 2015-04-12 11:22:55 +08:00
spacewander b109c866b7 Hope to fix #341 2015-04-10 00:58:59 +08:00
Kylie McClain 5b1ac3ccc6 use argument separator for usages of grep which can choke on weird input 2015-04-08 18:51:30 -04:00
spacewander 888919c2e9 add git-guilt 2015-04-06 15:59:53 +08:00
spacewander 3330af6cd4 sort unless there is only one item 2015-03-22 22:55:15 +08:00
hemanth.hm 1a25e57069 Merge pull request #333 from paulschreiber/merged-branches 
Fixes #332 git show-merged-branches and show-unmerged-branches
 2015-03-18 19:12:08 +05:30
Paul Schreiber 00050b91da add show-merged-branches and show-unmerged-branches 2015-03-18 09:33:02 -04:00
Paul Schreiber 668cc9ef78 when deleting merged branches, preserve "svn" branch for git-svn 
Fixed #328
 2015-03-17 14:00:40 -04:00
hemanth.hm 9b50ce3000 Merge pull request #324 from chernjie/git-ignore 
Support ~ in git-ignore.
 2015-03-17 13:24:23 +05:30
Mark Eissler fbe171e280 Fix tag trapping when HEAD and tag point to same commit. 
When the last tag is also the last commit, then we need to account
for a much longer tag output:

  HEAD, tag: v1.0.1, origin/master, origin/HEAD,...

This fix strips out 'HEAD', the rest is handled by existing code.
 2015-03-16 13:37:53 -07:00
Mark Eissler 29cd63bea2 Fix gitflow commit history output. 
When gitflow is used, commits on merged feature branches were
appearing in the generated output with tags labeled as:

  origin/feature/BRANCH_NAME

This fix filters out any 'tags' that include forward slashes,
which eliminates this behavior. The commits then appear as part
of the tag they were merged in with.
 2015-03-16 12:16:10 -07:00
Mark Eissler 49e8cf17a4 Complete rewrite to support commit ranges for pretty and list output. 2015-03-11 11:43:35 -07:00
CJ 522213a28f Support ~ in add_patterns for git-ignore 2015-03-11 15:00:30 +08:00
CJ bf89063212 Support ~ in show git-ignore 2015-03-11 15:00:24 +08:00
spacewander d94663312f add merge-into to merge two branches quickly 2015-03-10 23:45:00 +08:00
Andrew Starr-Bochicchio 28df09b103 git-fresh-branch: Check for changes and prompt for input before nuking. (Issue: #142) 2015-03-09 22:14:37 -04:00
hemanth.hm 14ef2a88ef Merge pull request #308 from spacewander/git-utility 
extra mktemp into git_extra_mktemp.
 2015-03-08 23:37:20 +05:30
hemanth.hm a48402153b Merge pull request #312 from RichardLitt/feature/concat-extra-feature-names 
Added in option to concat extra feature names.
 2015-03-08 23:36:41 +05:30
Ciro Nunes c1b0067a97 fix gh-pages to stash and don't delete files 
Closes #137
 2015-03-03 09:04:20 -03:00
Jianjin Fan 6df9673936 Allow empty initial commit when setup repo. 
When hit `git setup` in an empty directory, it doesn't create a commit. But often we need an empty initial commit for future rebasing and reseting, etc. Fixes #318.
 2015-02-20 12:25:25 +08:00
jykntr bfeb897a6d git-summary correctly displays project name 
git-summary correctly displays project name when not executed in the top
level directory of a repository.  Fixes tj/git-extras#302.

Uses the git-sh-setup script to find top level directory and then uses
that directory name for the project name.
 2015-02-18 17:09:39 -07:00
Damian Krzeminski fabb2c5541 changelog: add git-config support for format and log options 
(1) make format configurable

you can change the default changelog format by configuring
changelog.format git variable

for example:

  git config changelog.format '- %s (%ae)'

gives you something like that:

  - Merge pull request #298 from timfeirg/master (hemanth.hm@gmail.com)
  - remove stuff from readme & form a list (kkcocogogo@gmail.com)

see git-log man for more examples

(2) make log options configurable

set `changelog.opts` to influence the way changelogs are generated

    git config changelog.opts --no-merges

or:

    git config changelog.opts --first-parent

fixes #285

also:
- delay calculating HEAD until needed
- remove extra line before header
 2015-02-15 22:40:24 -05:00
Damian Krzeminski a86d850688 use standard git editor in git-authors & git-changelog 
The editor used will be chosen from the GIT_EDITOR environment variable,
the core.editor configuration variable, the VISUAL environment variable,
or the EDITOR environment variable (in that order).

That ensures that `git-changelog` and `git-authors` will use the same editor
as `git-commit`, `git-merge` etc.
 2015-02-13 17:51:22 -05:00
Riceball LEE 48eb195ee0 + custom commit message options supports 2015-02-12 17:55:31 +08:00
hemanth.hm 83b9348c91 Merge pull request #300 from chernjie/git-scp 
git scp - Copy files to SSH compatible `git-remote`.
 2015-02-11 13:47:01 +05:30
Richard Littauer b1a790b851 Added in option to concat extra feature names 
This takes any extra arguments supplied to `$git feature` and sets
them as the new feature name. For instances, instead of throwing an
error if `$git feature new thing` is called, it will create branch
`feature/new-thing`.
 2015-02-10 16:02:39 -08:00
hemanth.hm ced7ec0c97 Merge pull request #310 from imsky/git-delta 
Added `git-delta`.
 2015-02-10 09:45:54 +05:30
Ivan Malopinsky e7b371b355 git-delta 2015-02-09 21:09:11 -05:00
wooorm b0a6d04f9f Add git-authors 2015-02-07 17:24:21 +01:00
spacewander 32aee50bc6 extra mktemp into git_extra_mktemp 
now we can put all utility functions to git-extra-utility
 2015-02-05 14:22:49 +08:00
Chris Hall a36b7f4934 adding git-chore 2015-02-04 11:52:23 -05:00
spacewander e1cedf7fd2 add enough X to fix #303. 
GNU mktemp requires at least three X in the last part of template.
 2015-02-02 21:35:44 +08:00