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
654 commits 5 branches 57 tags 6.1 MiB
Commit graph

654 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
hemanth.hm b84faa58b6 Merge pull request #355 from markeissler/better-changelog-fixes 
Fix git-changelog for compatibility for bash<4. Fixes #337, #338
 2015-04-25 20:40:19 +05:30
Mark Eissler a1ac472f9e Merge branch 'better-changelog-fixes' of github.com:markeissler/git-extras into better-changelog-fixes 2015-04-24 12:01:13 -07:00
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
Mark Eissler fcbb25a882 Merge pull request #1 from spacewander/better-changelog-fixes 
Add support for git version below 2.2.0
 2015-04-24 09:58:44 -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
hemanth.hm 3055a664f9 Merge pull request #357 from imsky/merge-repo 
git-merge-repo
 2015-04-20 08:31:53 +05:30
Ivan Malopinsky 05b0a5d3d5 git-merge-repo 2015-04-19 12:23:02 -04:00
spacewander c143b75711 add support for git version below 2.2.0 2015-04-18 18:11:18 +08:00
Mark Eissler 61da46ff11 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-16 14:03:47 -07:00
hemanth.hm d6c155c477 Merge pull request #349 from spacewander/git-guilt 
fix indentation errors in git guilt
 2015-04-12 09:13:35 +05:30
spacewander b375870693 fix indentation errors in git guilt 2015-04-12 11:22:55 +08:00
hemanth.hm 530e5778cc Merge pull request #345 from spacewander/git-guilt 
Hope to fix #341
 2015-04-10 05:20:54 +05:30
spacewander b109c866b7 Hope to fix #341 2015-04-10 00:58:59 +08:00
hemanth.hm c00202d51e Merge pull request #344 from Somasis/master 
Prevent strange input and environment variables from causing issues
 2015-04-09 09:21:25 +05:30
Kylie McClain 5b1ac3ccc6 use argument separator for usages of grep which can choke on weird input 2015-04-08 18:51:30 -04:00
Kylie McClain 336501382e helper/reset-env: helper to prevent GREP_OPTIONS from causing issues 2015-04-08 18:50:41 -04:00
hemanth.hm 23c270bc0f Merge pull request #342 from spacewander/git-guilt 
add git guilt
 2015-04-07 11:19:24 +05:30
spacewander 9f24b17b4a add docs for git guilt 2015-04-06 16:23:01 +08:00
spacewander 888919c2e9 add git-guilt 2015-04-06 15:59:53 +08:00
hemanth.hm a51fb418b2 Merge pull request #340 from spacewander/git-effort 
sort unless there is only one item, fixes #339
 2015-03-23 11:47:16 +05:30
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
hemanth.hm 4398f110f1 Merge pull request #334 from paulschreiber/dont-delete-svn-branch 
when deleting merged branches, preserve "svn" branch for git-svn
 2015-03-18 10:30:05 +05:30
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
hemanth.hm d8d33f5a3e Merge pull request #331 from markeissler/better-changelog-fixes 
git-changelog fixes
 2015-03-17 09:18:52 +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
hemanth.hm 055abc3e4c Merge pull request #327 from markeissler/better-changelog-completion 
Updated bash completions for better-changelog.
 2015-03-14 12:08:23 +05:30
Mark Eissler de8d216c54 Updated bash completions for better-changelog. 2015-03-13 18:39:50 -07:00
hemanth.hm e4ea8690db Merge pull request #325 from markeissler/better-changelog 
Complete rewrite to support commit ranges for pretty and list output.
 2015-03-12 11:38:08 +05:30
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
hemanth.hm 06a8f74f28 Merge pull request #323 from spacewander/master 
add git-merge-into.
 2015-03-11 10:05:32 +05:30
spacewander 46525fbfe8 add docs for git-merge-into 2015-03-10 23:50:09 +08:00
spacewander d94663312f add merge-into to merge two branches quickly 2015-03-10 23:45:00 +08:00
hemanth.hm d690268b43 Merge pull request #322 from andrewsomething/master 
git-fresh-branch: Check for changes and prompt for input before nuking. (Issue: #142)
 2015-03-10 08:14:39 +05:30
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
hemanth.hm 475124ac6e Merge pull request #320 from cironunes/gh-pages-fix 
fix gh-pages to stash and don't delete files.
 2015-03-03 18:12:02 +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
hemanth.hm 30ac2ae550 Merge pull request #319 from pfctgeorge/allow-empty-when-setup 
Allow empty initial commit when setup repo.
 2015-02-20 10:21:35 +05:30
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
hemanth.hm 722a4061ac Merge pull request #317 from jykntr/master 
git-summary correctly displays project name.
 2015-02-19 21:12:48 +05:30