Commit graph

341 commits

Author SHA1 Message Date
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
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
spacewander d94663312f add merge-into to merge two branches quickly 2015-03-10 23:45:00 +08:00
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
Ciro Nunes c1b0067a97 fix gh-pages to stash and don't delete files
Closes #137
2015-03-03 09:04:20 -03:00
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
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
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
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
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
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
wooorm b0a6d04f9f Add git-authors 2015-02-07 17:24:21 +01: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
Chris Hall a36b7f4934 adding git-chore 2015-02-04 11:52:23 -05:00
spacewander e1cedf7fd2 add enough X to fix #303.
GNU mktemp requires at least three X in the last part of template.
2015-02-02 21:35:44 +08:00
wooorm 1199186652 Fix typo in in git ignore message 2015-01-23 11:58:38 +01:00
CJ 195fb17458 symlink git-rscp to git-scp 2015-01-19 12:27:56 +08:00
hemanth.hm e738f760ae Avoid duplicating asterisk.
Closes https://github.com/tj/git-extras/pull/218
2015-01-18 22:10:39 +05:30
Jon Ander Peñalba bfd38ca891 When deleting a branch check if git has config.
Don't assume that the remote is always origin and that the
remote branch name is the same as the local one
2014-12-17 11:33:09 +01:00
CJ 73d5209743 adapted a more generic, customizable and friendly script 2014-12-16 21:26:18 +08:00
CJ 399073af7b Copy from git-goth https://github.com/chernjie/git-goth 2014-12-16 20:12:06 +08:00
hemanth.hm 081e14f88f Merge pull request #226 from tsldh/master
Added changelog -c flag to git-release.
2014-12-07 10:49:24 +05:30
David Hartmann 292586d96f added changelog to release as optional flag
- rewrote the flags to contain multiple
- added -c as changelog option
2014-12-06 14:43:34 -05:00
Matthew Avant 7701ba4069 Use mktemp for temporary file creation. 2014-12-04 11:01:40 -08:00
dead-horse 9a9be49b63 make release hook more flexible 2014-12-03 00:57:41 +08:00
Ben Parnell 0b0b688c17 added --no-color to git-delete-merged-branches 2014-12-01 10:20:26 +00:00
hemanth.hm 7b7913fab1 More portable she-bangs. 2014-11-30 17:47:26 +05:30
Dan Jackson d7d6ff2fed Use process-specific tmp file and clean up on exit
Fixes #279 using the suggestion from @hemanth, with some minor tweaks:

- I kept the leading . because I figured there was a reason it was put there originally.
- Changed the show_cursor method that's called when the process exits (prematurely or naturally) to be show_cursor_and_cleanup, and added a line to it that cleans up the tmp file.
2014-11-26 10:23:54 -08:00
Valérian Galliat 5ee706b585 git-info: POSIX compliance
Replace `echo -n` (non-POSIX) with an helper function `echon` echoing a
newline after given expression.
2014-11-26 14:02:29 +01:00
hemanth.hm 53e4f3c89d Fixes #277 2014-11-21 00:31:43 +05:30
hemanth.hm e7990ed810 Merge pull request #276 from spacewander/master
git-ignore will cd root to find .gitignore.
2014-11-21 00:27:09 +05:30
Hemanth.HM cb0e56639c Version bump. 2014-11-18 21:37:03 +05:30
spacewander 0374044790 modify the behavior of git-ignore, now it will cd root to find .gitignore 2014-11-17 21:36:56 +08:00
spacewander 92c34e8e00 add new command 'git root' to show the path to root of repo 2014-11-13 16:12:50 +08:00
hemanth.hm 1748fb29c5 Merge pull request #271 from bohnman/git-rename-tag-fix
tag to tags
2014-11-08 11:14:59 +05:30
spacewander 76e0dfef97 replace visionmedia/git-extras to tj/git-extras
Although Github reserves the 'visionmedia' user space(a visit to there
will be redirected to 'tj'), it's better to
rename the links from visionmedia/git-extras to tj/git-extras
2014-11-06 17:12:01 +08:00
Ryan Bohn 53efa98c15 changing incorrect reference of tag to tags 2014-11-05 15:29:48 -05:00
Kevin Woo 6d7f10c0c6 added git-locked to check what files have been locked 2014-10-16 20:53:47 -05:00
Guillaume Seren db0f610bc1
Fix #267, git-missing did not catch branch name.
It was a bug on my setup, the test did no detect the
branch name, so I change:
if [[ $arg != -* ]]; then
by
if [ -n "${arg}" ]; then

According to test man page, -n:
«True if the length of string is non-zero.»

I also added quote and {} around the param,
to prevent bash expension around strange char.
2014-10-14 16:24:18 +02:00
hemanth.hm 3c7d4e67f4 Version 2.1.0 2014-10-13 17:51:54 +05:30
hemanth.hm e294617d10 Fixes #266 2014-10-13 17:49:34 +05:30
hemanth.hm daf0c0c048 Merge pull request #263 from Yitsushi/bug/180-does-not-check-out-branch-if-it-already-exists
fix #180 and #232 feature|bug|refactor checkout.
2014-10-07 17:27:55 +05:30