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

636 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
hemanth.hm a618a56754 Merge pull request #316 from code42day/changelog-config 
`changelog` config.
 2015-02-16 09:23:21 +05:30
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
hemanth.hm f12e7ac27c Merge pull request #315 from code42day/consistent-editor 
use standard git editor in git-authors & git-changelog.
 2015-02-14 16:41:04 +05:30
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
hemanth.hm 8750491323 Merge pull request #314 from snowyu/feature/custom-commit-message 
added custom commit message option to `git-release`
 2015-02-12 19:11:34 +05:30
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
hemanth.hm f20e260a9a Merge pull request #313 from wooorm/bug/fix-missing-closing-brace 
Fix missing closing curly brance in `bash_completion.sh`.
 2015-02-11 13:46:00 +05:30
wooorm a58ee0a4e9 Fix missing closing curly brance in bash_completion.sh 
- Introduced in b0a6d04f9ff303a9864070eda45c7309e3789ad4;
- Comments: https://github.com/tj/git-extras/commit/
  b0a6d04f9ff303a9864070eda45c7309e3789ad4#commitcomment-9687275.
 2015-02-11 08:53:12 +01:00
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
hemanth.hm d4e40101f7 Merge pull request #309 from wooorm/feature/add-git-authors 
Added `git-authors`.
 2015-02-08 12:10:18 +05:30
wooorm b0a6d04f9f Add git-authors 2015-02-07 17:24:21 +01:00
CJ 0325c46a43 tj#300 Added bash completion 2015-02-05 18:23:37 +08: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
hemanth.hm c50f096ee3 Merge pull request #307 from ckhall/feature/add_git_chore_workflow 
adding git-chore.
 2015-02-05 11:21:15 +05:30