Commit graph

270 commits

Author SHA1 Message Date
Sasha Khamkov bd80a4e512 FIX: check if un-pushed commits
- switch the check for un-pushed commits from `diff-index` to more simple check
- still ignores sub-modules

Closes #234

Clarification: 
As pointed by @cristiandouce in #234 - my flow was different (and pretty stupid to be honest on some particular project of mine) so some other work flow scenarios was failing to pass. 

I still feel such check is needed, because it is still populates Changelog|History files with empty lines if no un-pushed commits exist, so @hemanth merge this one or revert the [619232e](619232ef86)
2014-07-11 23:43:12 +03:00
Julio Napurí 08cdb7effb git-unlock Unlock local files in git repository 2014-07-10 11:27:58 -05:00
Julio Napurí 732ec9638f git-lock Lock files in git repository 2014-07-10 11:27:57 -05:00
Niklas Fiekas 3bd1b84759 Add git-rebase-patch 2014-07-10 09:54:17 +02:00
hemanth.hm b200552c90 Merge pull request #181 from zeroDivisible/feature/handle-misspellings
git bug|feature|refactor accepts a single argument if not finishing.
2014-07-09 11:13:02 +05:30
hemanth.hm 74acf8cab4 Merge pull request #193 from pzelnip/git-setup-no-overwrite
`git-setup` checks for an existing .git in target dir.
2014-07-09 11:01:42 +05:30
hemanth.hm 128bc2d5f8 Merge pull request #183 from chernjie/master
`git-create-branch`: use HEAD instead of origin.
2014-07-09 10:58:10 +05:30
hemanth.hm 619232ef86 Merge pull request #220 from sanusart/master
Add check for no changes in the tree (no sub-modules)
2014-07-09 10:56:25 +05:30
hemanth.hm 1a6cbf2433 Merge pull request #63 from justone/git_missing
Adding `git-missing` command.
2014-07-09 10:48:17 +05:30
hemanth.hm 0353b63e63 Merge pull request #216 from stephenmathieson/fix/changelog-large-versions
Changelog formatting for large version numbers.
2014-07-08 08:54:40 +05:30
hemanth.hm ab5c0364f6 Merge pull request #188 from twolfson/dev/add.multi.delete.squashed
Added multi-delete for git-delete-branch and git-delete-tag.
2014-07-07 18:04:11 +05:30
hemanth.hm 47bb6e0f74 Merge pull request #222 from jsipprell/pull/filenames-containing-spaces
git-effort handles filenames with whitespace.
2014-07-06 12:36:08 +05:30
hemanth.hm 039bb5c318 Merge pull request #223 from mwoc/master
Restoring debian changelog compatibility.
2014-07-06 12:34:21 +05:30
hemanth.hm a87403b57f Merge pull request #229 from yggdr/master
/usr/bin/env for portability.
2014-07-06 11:55:00 +05:30
eszabpt 698d027a0a Make git-obliterate work if there are whitespaces in filename 2014-07-04 11:16:17 +02:00
Konstantin Schukraft e4290dfb32 invoke bash via /usr/bin/env for portability 2014-07-02 09:41:37 +02:00
TJ Holowaychuk d437418b3c Release 1.9.1 2014-06-21 21:54:12 -07:00
Patryk Małek 4145f228e4 Fixed git-changelog errors when multiple files match change|history 2014-06-16 16:32:47 +02:00
Patryk Małek de6463fbee Fixed git-changelog errors on first usage 2014-06-16 16:27:57 +02:00
Maarten Winter 0687de734c Use two-space indents for log entry output, so it again is debian changelog compatible (as before commit 1235e4a5) 2014-04-29 10:51:30 +02:00
Jesse Sipprell 1479b9633a
git effort: handle filenames containing whitespace cleanly 2014-04-22 20:21:10 -04:00
Sasha Khamkov f2a41c54b1 Add check for no changes in the tree (no sub-modules) 2014-04-06 00:10:08 +03:00
Stephen Mathieson fde9d1cd30 Fix changelog formatting for large version numbers
This allows for version numbers which require more than 18 characters to
be underlined and pretty. :)
2014-02-24 11:45:42 -05:00
Damian Krzeminski 31bbed4ac8 Add --no-merges option to changelog
--no-merges allows for generating changelog without information about
merge commits
2013-12-01 18:18:03 -05:00
TJ Holowaychuk 0faaec7ce9 Merge pull request #199 from tlvince/refactor/git-delete-merged-branches
Simplify delete-merged-branches
2013-11-19 08:43:14 -08:00
Nathan Rajlich 519f678938 git-changelog: don't output a trailing space after the date
This has been driving me and others crazy for forever.
/cc @guille @MatthewMueller
2013-11-18 16:13:55 -08:00
Tom Vincent a909c8d20f Simplify delete-merged-branches
This will delete branches merged into the current branch.

This uses `-d` and is therefore safer than the current script (which uses `-D`).
IMO, this mitigates the need to prompt.
2013-10-24 12:06:24 +01:00
Adam Parkin 2b6e35d5eb Address issue #190, git-setup should test for existing .git in target directory
- now exits with an error message if the target directory already has a .git directory
2013-10-01 13:26:55 -07:00
Todd Wolfson 9b787421e7 Added multi-delete for git-delete-branch and git-delete-tag
Correcting typos
Compiled latest documentation
Applying changes from delete-tag to delete-branch for consistency
Removed unnecessary string quotes (thanks `git` ref design) and everything works
Tags are not being found with string concatenation
Updated delete-tag to accept multiple tags
Corrections for delete-branch
Updating docs for delete-tag
Added 'Todd Wolfson' to AUTHORS
Updated documentation for delete-branch
Moved deletions to concatenate strings and delete in one fell swoop
Reworking delete-branch to delete multiple branches in series
2013-09-15 14:40:35 -07:00
CJ e3320e2671 git-create-branch: bug fix for branch creation use HEAD instead of origin 2013-07-21 12:13:37 +08:00
zeroDivisible 93d92ae338 changed the code for git bug|feature|refactor to only accept single argument when not finishing a bug|feature|refactor. This is an easy solution to avoid misspelings of the word 'finish' 2013-07-18 14:33:41 +01:00
Nate Jones e5c8d79e66 allow options to be passed through to git log 2013-07-05 15:31:46 -07:00
Nate Jones 63d707c33c adding git-missing command 2013-07-05 15:31:46 -07:00
TJ Holowaychuk c45e2b8f5f Release 1.9.0 2013-06-18 13:45:24 -07:00
TJ Holowaychuk c136afba67 git-squash: add --me flag to flatten the current branch 2013-06-18 13:44:55 -07:00
Aurélien Scoubeau ed24416bf7 Make repository_age() "history rewrite safe"
Change commit date to author date, so that the repo age doesn't change if history rewriting tools (such as amend, rebase, filter-branch) are used.
2013-06-17 12:56:39 +02:00
soffolk dbc9fe0be4 modify to count for text file 2013-05-18 17:45:17 +08:00
soffolk 0386eb5bbe add git-line-summary 2013-05-18 16:02:02 +08:00
TJ Holowaychuk 84855b803d Release 1.8.0 2013-05-15 10:10:30 -07:00
TJ Holowaychuk 9800b326e5 Merge branch 'master' of github.com:visionmedia/git-extras 2013-05-15 10:01:28 -07:00
TJ Holowaychuk 111f04bb57 Merge pull request #102 from Phally/tag-in-command-line
Entering the tag name in the command line with git-changelog
2013-05-15 10:01:22 -07:00
TJ Holowaychuk a03bb363dd Merge branch 'master' of github.com:visionmedia/git-extras 2013-05-15 09:59:36 -07:00
TJ Holowaychuk 82cdab83f5 Merge pull request #165 from TheHippo/git-archive-file
Git archive file
2013-05-15 09:59:29 -07:00
TJ Holowaychuk dc52254843 Merge branch 'master' of github.com:visionmedia/git-extras 2013-05-15 09:57:57 -07:00
TJ Holowaychuk 7d2f933945 Merge pull request #168 from js-coder/master
git-repl improvements
2013-05-15 09:57:50 -07:00
TJ Holowaychuk 46175a69b9 Merge branch 'master' of github.com:visionmedia/git-extras 2013-03-25 08:24:07 -07:00
TJ Holowaychuk f6bb7ba042 git-delete-merged-branches: use -D instead of delete-branch
too slow
2013-03-25 08:23:57 -07:00
Greg Allen a79c51c7ad removed unnecessary git checkout for bug, feature and refactor 2013-03-07 17:44:11 -08:00
Phally 4f55198dca Added support for a --tag argument to directly set the tag name in the header. 2013-03-03 16:46:32 +01:00
Phally 1235e4a5ad Added support for multiple arguments in git-changelog. 2013-03-03 16:46:32 +01:00