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

1101 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nicolai Skogheim e31f61ba34 spelling: {a,an} archive. Fix #609 2016-12-26 19:22:55 +01:00
hemanth.hm df06f9af2e Merge pull request #606 from spacewander/fix-git-extras-update 
fix git-extras update and tweak Windows detection
 2016-12-07 09:45:30 +05:30
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 c5bd28dd51 stamp: show real looking results in Commands.md doc 2016-12-04 16:21:09 +01:00
Damien Tardy-Panis a7779a1029 stamp: add warning in documentation about corner case 2016-12-04 16:21:09 +01:00
Damien Tardy-Panis 9ea8f98e5c stamp: add zsh autocompletion 2016-12-04 16:21:09 +01: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 705bb32a7a stamp: add to Commands doc 2016-12-04 16:21:05 +01:00
Damien Tardy-Panis 3b621f1052 stamp: add manual 2016-12-04 16:18:54 +01:00
Damien Tardy-Panis 13f15d5339 stamp: add bash autocompletion 2016-12-04 16:18:54 +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
hemanth.hm 20a9e95b9a Merge pull request #602 from richardfearn/git-delete-merged-branches-fix 
git-delete-merged-branches: use "xargs -r" to prevent error when there are no branches to delete
 2016-11-20 05:15:58 +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
罗泽轩 7f14cc4488 Merge pull request #599 from richardfearn/improve-yes-no-prompts 
git-{clear,clear-soft,sync}: improve yes/no prompts
 2016-11-20 01:17:18 +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
hemanth.hm 1ed75978a9 Merge pull request #598 from richardfearn/fix-git-sed-typo 
git-sed: fix 'unkonwn' typo
 2016-11-19 20:52:43 +05:30
罗泽轩 54de081be7 Merge pull request #597 from richardfearn/commands-md-improvements 
Improvements to Commands.md
 2016-11-19 22:20:02 +08:00
Richard Fearn 009f4fb6d1 git-sed: fix 'unkonwn' typo 2016-11-19 14:03:21 +00:00
Richard Fearn 575f5dfd19 Commands.md: add link to 'git summary' in 'git line-summary' documentation 2016-11-19 13:41:21 +00:00
Richard Fearn 2a70117f02 Commands.md: add links to "git bug", etc. to index 
Replace single "git feature|refactor|bug|chore" link with separate links for
each of the four commands, so they all appear in the right place in the index.
 2016-11-19 13:36:48 +00:00
Richard Fearn c5d29821da Commands.md: add 'git rscp' link to 'git scp' documentation 
(git scp documentation also covers git rscp)
 2016-11-19 13:33:39 +00:00
Richard Fearn 4d92c8bdbf Commands.md: put commands in alphabetical order 2016-11-19 13:29:00 +00:00
hemanth.hm 9f48c6a1cc Merge pull request #596 from richardfearn/archive-file-typo-fix 
Fix typo in archive-file documentation
 2016-11-18 20:29:20 +05:30
Richard Fearn c3a303ef70 Fix typo in archive-file documentation 2016-11-18 12:26:11 +00:00
罗泽轩 e1f0f6937a Merge pull request #595 from aaguilera/master 
fix: git-squash docs. Replaced 'actual' with 'current'
 2016-11-18 10:18:38 +08:00
Angel Aguilera 77e55640d7 fix: git-squash docs. Replaced 'actual' with 'current' 2016-11-14 11:17:28 +01:00
hemanth.hm ec64fe6500 Merge pull request #592 from spacewander/fix_integrity 
Fix integrity for git-reauthor
 2016-11-12 20:45:45 -08:00
spacewander 7aa7bcf740 Add travis ci 2016-11-12 15:03:10 +08:00
hemanth.hm 2d6e4eaf8a Merge pull request #594 from spacewander/fix_release 
Show all commit messages if no tag found
 2016-11-05 22:55:06 +05:30
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
spacewander dead6873db Add git-reauthor to completion script 2016-11-01 10:24:12 +08:00
spacewander c8142ca539 Relax #! format check 2016-11-01 10:22:45 +08:00
罗泽轩 db62a6d95c Merge pull request #591 from nottrobin/force-clone 
git-force-clone
 2016-10-31 09:52:38 +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