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

388 commits

Author SHA1 Message Date
Nicolai Skogheim 526fb77823 Quote variables bc of filenames with spaces 2015-07-29 05:10:52 +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