.gitmodules

@@ -1,3 +1,3 @@
 [submodule "shFlags"]
 	path = shFlags
-	url = https://github.com/nvie/shFlags.git
+	url = git://github.com/nvie/shFlags.git

COPYING

@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.

Makefile

@@ -41,7 +41,6 @@ EXEC_FILES=git-now
 SCRIPT_FILES =git-now-add
 SCRIPT_FILES+=git-now-grep
 SCRIPT_FILES+=git-now-rebase
-SCRIPT_FILES+=git-now-push
 SCRIPT_FILES+=gitnow-common
 SCRIPT_FILES+=gitnow-shFlags
 

README.mdown

@@ -1,7 +1,7 @@
 git-now
 ========
-``git-now`` is a command-line tool for light and temporary commit.
+``git-now`` is a command-line tool for light and temporary commit
-It commits with a log message from time now and diff.
+with a log message from time now and diff.
 
 Usage
 ---------------
@@ -13,7 +13,7 @@ You can use the same option as ``git add``.
 
     $ git now [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]
               [--edit | -e] [--all | [--update | -u]] [--intent-to-add | -N]
-              [--refresh] [--ignore-errors] [--ignore-missing] [--stat | -s] [--]
+              [--refresh] [--ignore-errors] [--ignore-missing] [--]
               [<filepattern>...]
 
 ### Subcommands
@@ -21,9 +21,7 @@ You can use the same option as ``git add``.
 Available subcommands are:
 
  * rebase -    rebase for temporary commits.
- * push   -    rebuild that is remove and push remote branch.<br />
+ * grep -      grep temporary commits.
-   _If you already pushed ``git-now`` commits to remote and rebase these, you should run this subcommand._
- * grep   -    grep temporary commits.
 
 _Try 'git now \<subcommand\> help' for details._
 
@@ -34,41 +32,21 @@ Installation
 ### Mac OS
 If you're on a Mac and use [homebrew](http://github.com/mxcl/homebrew), it's simple:
 
-    $ brew install git-now
+    $ brew install https://github.com/iwata/git-now/raw/master/git-now.rb
-
-#### install options
- * ``--zsh-completion``<br />copy zsh completion function to ``/usr/local/share/zsh/functions`` for zsh users
-
-        $ brew install --zsh-completion git-now
-
-    Show details
-
-        $ brew options git-now
 
 ### Manual installation
 If you prefer a manual installation, please use the following instructions:
 
-    $ git clone --recursive https://github.com/iwata/git-now.git
+	$ git clone --recursive git://github.com/iwata/git-now.git
 
-#### for Windows
 Then, you can install `git-now`, using:
 
-    > .\contrib\msysgit-install.bat
+	$ sudo make install
-
-By default, git-now will be installed in %HOME%, If %HOME% is not defined be installed in %UserProfile%\bin.
-
-
-*note : shFlags needs "getopt.exe" or others, Reffer to [gitflow installation document] (https://github.com/nvie/gitflow/wiki/Windows).*
-
-#### for Others
-Then, you can install `git-now`, using:
-
-    $ sudo make install
 
 By default, git-now will be installed in /usr/local. To change the prefix
 where git-now will be installed, simply specify it explicitly, using:
 
-    $ sudo make prefix=/opt/local install
+	$ sudo make prefix=/opt/local install
 
 Or simply point your `PATH` environment variable to your git-now checkout
 directory.
@@ -77,13 +55,8 @@ directory.
 See also
 ---------------
 
-* [An original git-now idea](http://d.hatena.ne.jp/sinsoku/20101208/1291770514) (by [sinsoku](https://github.com/sinsoku))
+* [An original git-now idea](http://d.hatena.ne.jp/sinsoku/20101208/1291770514) (by [Toshiyuki Kawanishi](https://github.com/toshi-kawanishi))
-* [An original git-now code](https://github.com/toshi-kawanishi/git-now-original-code) (by [Toshiyuki Kawanishi](https://github.com/toshi-kawanishi))
 * [Installation with homebrew](http://d.hatena.ne.jp/nobeans/20110322/1300776839) (by [Yasuharu NAKANO](https://github.com/nobeans))
 * [Referred to shell scripts](https://github.com/nvie/gitflow) (by [Vincent Driessen](https://github.com/nvie))
-* [Write the RPM spec](http://d.hatena.ne.jp/kazuhisya/20110704/1309783736) (by [Kazuhisa Hara](https://github.com/kazuhisya))
 
-Special thanks
+
----------------
- * [MIZUNO Hiroki](https://github.com/mzp)
- * [todesking](https://github.com/todesking)

contrib/exclude.txt

@@ -1,4 +0,0 @@
-.gitmodules
-Makefile
-README.mdown
-gitnow-shFlags

contrib/msysgit-install.cmd

@@ -1,24 +0,0 @@
-@echo off
-
-set STARTUP_PATH=%~d0%~p0
-if "%HOME%" == "" goto sethome
-goto makedir
-
-:sethome
-echo set HOME variable
-set HOME=%UserProfile%
-
-:makedir
-if exist %HOME%\bin goto copyshflags
-echo make bin folder
-mkdir %HOME%\bin
-
-:copyshflags
-set MSYS_BIN=%HOME%\bin
-echo Installing git-now to "%MSYS_BIN%"
-
-echo copy shFlags
-copy %STARTUP_PATH%..\shFlags\src\shflags %MSYS_BIN%\gitnow-shFlags
-
-:copygitnow
-xcopy /EXCLUDE:%STARTUP_PATH%exclude.txt /D /Y %STARTUP_PATH%..\* %MSYS_BIN%

etc/_git-now

@@ -1,123 +0,0 @@
-#compdef git-now
-#
-# git-now ZSH completion function
-#
-# Installation
-# ------------
-# Drop this somewhere in your $fpath (like /usr/share/zsh/site-functions)
-# and rename it _brew
-#
-# altered from _fink
-#
-
-__git-now-add ()
-{
-  local curcontext="$curcontext" state line expl
-  typeset -A opt_args
-
-  _arguments -s :\
-    '(--all -h --help)-n[do not actually add files; only show which ones would be added]'\
-    '(--all -h --help)-v[show files as they are added]'\
-    '(-f --force --all -h --help)'{-f,--force}'[allow adding otherwise ignored files]'\
-    '(-i --interactive --all -h --help)'{-i,--interactive}'[add contents interactively to index]'\
-    '(-p --path --all -h --help)'{-p,--path}'[like -i but go directly into patch mode for specified files]'\
-    '(-e --edit --all -h --help)'{-e,--edit}'[open diff against index in editor]'\
-    '(-u --update --all -h --help)'{-u,--update}'[update only files git already knows about]'\
-    '(-N --intent-to-add --all -h --help)'{-N,--intent-to-add}'[record only that path will be added later]'\
-    '(-s --stat -h --help)'{-s,--stat}'[generate diffstat instead of patch]'\
-    '(-h --help)--push[push to remote after performing finish]'\
-    '(-n -v -f --force -i --interactive -p --path -e --edit -u --update -N --intent-to-add -h --help)--all[add --update and add .]'\
-    '(-n -v -f --force -i --interactive -p --path -e --edit -u --update -N --intent-to-add -h --help --all --push)'{-h,--help}'[show help message]'\
-    ':filepattern:_files'
-}
-
-__git_remotes () {
-  local expl gitdir remotes
-
-  gitdir=$(_call_program gitdir git rev-parse --git-dir 2>/dev/null)
-  __git_command_successful || return
-
-  remotes=(${${(f)"$(_call_program remotes git config --get-regexp '"^remote\..*\.url$"')"}//#(#b)remote.(*).url */$match[1]})
-  __git_command_successful || return
-
-  # TODO: Should combine the two instead of either or.
-  if (( $#remotes > 0 )); then
-    _wanted remotes expl remote compadd $* - $remotes
-  else
-    _wanted remotes expl remote _files $* - -W "($gitdir/remotes)" -g "$gitdir/remotes/*"
-  fi
-}
-
-__git_branch_names () {
-  local expl
-  declare -a branch_names
-
-  branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})
-  __git_command_successful || return
-
-  _wanted branch-names expl branch-name compadd $* - $branch_names
-}
-
-__git_command_successful () {
-  if (( ${#pipestatus:#0} > 0 )); then
-    _message 'not a git repository'
-    return 1
-  fi
-  return 0
-}
-
-local curcontext="$curcontext" state line expl
-typeset -A opt_args
-
-_arguments -C \
-  ':command:->command' \
-  '*::options:->options'
-
-case $state in
-  (command)
-
-    local -a subcommands
-    subcommands=(
-    'add:default subcommand.'
-    'rebase:rebase for temporary commits.'
-    'push:remove remote branch and push to remote repoistory for rebase commits.'
-    'grep:grep temporary commits.'
-    )
-    _describe -t commands 'git now' subcommands
-    __git-now-add
-    ;;
-
-  (options)
-    case $line[1] in
-
-      (add)
-        __git-now-add
-        ;;
-
-      (rebase)
-        _arguments \
-          '(-m --mine -h --help)'{-m,--mine}'[limit git-now commits by your name]'\
-          '(-m --mine -h --help)'{-h,--help}'[show help message]'\
-          ':base-branch-name:__git_branch_names'
-        ;;
-
-      (push)
-        _arguments \
-          ':remote-repostory:__git_remotes'
-        ;;
-
-      (grep)
-        _arguments -s : \
-          '(-p --patch -h --help)'{-p,--patch}'[generate diff in patch format]'\
-          '(-s --stat -h --help)'{-s,--stat}'[generate diffstat instead of patch]'\
-          '(-m --mine -h --help)'{-m,--mine}'[limit git-now commits by your name]'\
-          '(-m --mine -s --stat -p --patch -h --help)'{-h,--help}'[show help message]'\
-          ':base-branch-name:__git_branch_names'
-        ;;
-      (*)
-        __git-now-add
-        ;;
-    esac
-    ;;
-esac
-

etc/git-now.rb

@@ -1,49 +0,0 @@
-require 'formula'
-
-class GitNow < Formula
-  url  'https://github.com/iwata/git-now.git', :tag => 'v0.1.1.0'
-  version '0.1.1.0'
-  head 'https://github.com/iwata/git-now.git', :branch => 'develop'
-  homepage 'https://github.com/iwata/git-now'
-
-  def options
-    [
-        ['--zsh-completion', "copy zsh completion function file to #{share}/zsh/functions: please add #{share}/zsh/functions to $fpath in .zshrc"]
-    ]
-  end
-
-  def patches
-    DATA
-  end
-
-  # for longopt
-  depends_on 'gnu-getopt'
-
-  def install
-    system "make", "prefix=#{prefix}", "install"
-    if ARGV.include? '--zsh-completion'
-      zsh_functions_d = share + 'zsh/site-functions'
-      zsh_functions_d.install "etc/_git-now"
-    end
-  end
-
-end
-
-#This patch makes sure GNUtools are used on OSX.
-#gnu-getopt is keg-only hence the backtick expansion.
-#These aliases only exist for the duration of git-now,
-#inside the git-now shells. Normal operation of bash is
-#unaffected - getopt will still find the version supplied
-#by OSX in other shells, for example.
-__END__
---- a/git-now
-+++ b/git-now
-@@ -1,5 +1,7 @@
- #!/bin/sh
-
-+alias getopt='`brew --prefix gnu-getopt`/bin/getopt'
-+
- # enable debug mode
- if [ "$DEBUG" = "yes" ]; then
-   set -x
-

etc/git-now.spec

@@ -1,40 +0,0 @@
-Summary: making convenient git commit
-Name: git-now
-Version: 0.0
-Release: 1%{?dist}
-License: Apache License, Version 2.0
-Group: Development/Languages
-Provides: git-now
-Requires: git
-BuildRequires: git
-Source0: git-now
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Packager: Kazuhisa Hara <kazuhisya@gmail.com>
-
-%description
-git now: making convenient git commit
-
-%prep
-
-%build
-
-%install
-mkdir -p $RPM_BUILD_ROOT/usr/libexec/git-core
-make prefix=$RPM_BUILD_ROOT/usr/libexec/git-core install
-
-%clean
-rm -Rf $RPM_BUILD_ROOT
-
-%post
-
-%files
-%defattr(-,root,root)
-/usr/libexec/git-core/git-now
-
-
-%changelog
-* Mon Jul 04 2011 Kazuhisa Hara <kazuhisya@gmail.com>
-- Initial version
-* Mon Oct 17 2011 Motonori Iwata <gootonori@gmail.com>
-- use Makefile

git-now

@@ -1,28 +1,12 @@
-#!/bin/bash
+#!/bin/sh
 
 # enable debug mode
 if [ "$DEBUG" = "yes" ]; then
   set -x
 fi
 
-GITNOW_DIR=$0
+export GITNOW_DIR=$(dirname "$0")
-GITNOW_DIR=${GITNOW_DIR%\\*} # for msysGit
+PREFIX="from now"
-GITNOW_DIR=${GITNOW_DIR%/*}  # for others
-export GITNOW_DIR
-
-prefix_config=`git config now.prefix`
-if [ $? -eq 0 ]; then
-  PREFIX=$prefix_config
-else
-  PREFIX="from now"
-fi
-
-bracket_config=`git config now.bracket`
-if [ $? -eq 0 ]; then
-  BRACKET=$bracket_config
-else
-  BRACKET=true
-fi
 
 usage() {
   echo "usage: git now [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]"
@@ -35,7 +19,6 @@ usage() {
   echo "Available subcommands are:"
   echo "   add       default subcommand."
   echo "   rebase    rebase for temporary commits."
-  echo "   push      remove remote branch before push to remote repoistory for rebase commits."
   echo "   grep      grep temporary commits."
   echo
   echo "Try 'git now <subcommand> help' for details."

git-now-add

@@ -1,57 +1,23 @@
 usage() {
   echo "usage: git now add [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]"
   echo "               [--edit | -e] [--all | [--update | -u]] [--intent-to-add | -N]"
-  echo "               [--refresh] [--ignore-errors] [--ignore-missing] [--stat | -s] [--push]"
+  echo "               [--refresh] [--ignore-errors] [--ignore-missing] [--]"
-  echo "               [--] [<filepattern>...]"
+  echo "               [<filepattern>...]"
 }
 
 cmd_default() {
-  if [ $BRACKET = "true" ]; then
+  MESSAGE="[${PREFIX}] `date +\"%Y/%m/%d %T\"`"
-    prefix_str="[${PREFIX}]"
-  else
-    prefix_str=$PREFIX
-  fi
-  MESSAGE="${prefix_str} `date +\"%Y/%m/%d %T\"`"
-
   if [ $# -eq 0 ]; then
     git add -u
-    printf "${MESSAGE}\n\n%s" "`git diff --cached --no-ext-diff`" | git commit -F -
+    printf "${MESSAGE}\n\n%s" "`git diff --cached`" | git commit -F -
   else
-    local is_all=false
+    if [ $1 != "--all" ]; then
-    local is_stat=false
+      git add $@
-    local is_push=false
-    local args=()
-
-    # args loop
-    for arg in "$@"
-    do
-      if [ $arg = "--stat" ] || [ $arg = "-s" ]; then
-        is_stat=true
-      elif [ $arg = "--all" ]; then
-        is_all=true
-      elif [ $arg = "--push" ]; then
-        is_push=true
-      else
-        n=${#args[@]}
-        args[$n]=$arg
-      fi
-    done
-
-    if ! $is_all; then
-      git add ${args[@]}
     else
       git add -u
       git add .
     fi
-
+    printf "${MESSAGE}\n\n%s" "`git diff --cached`" | git commit -F -
-    if $is_stat; then
-      printf "${MESSAGE}\n\n%s" "`git diff --cached --stat --no-ext-diff`" | git commit -F -
-    else
-      printf "${MESSAGE}\n\n%s" "`git diff --cached --no-ext-diff`" | git commit -F -
-    fi
-    if $is_push; then
-      git push
-    fi
   fi
 }
 
@@ -60,4 +26,3 @@ cmd_help() {
   exit 0
 }
 
-# vim: set ff=unix ft=sh :

git-now-grep

@@ -1,5 +1,5 @@
 usage() {
-  echo "usage: git now grep [--patch|-p] [--stat|-s] [--mine|-m] [<base-branch>]"
+  echo "usage: git now grep [--patch|-p] [--stat|-s] [<base-branch>]"
 }
 
 cmd_default() {
@@ -18,7 +18,6 @@ parse_args() {
   # parse options
   DEFINE_boolean 'patch' false 'generate diff in patch format' 'p'
   DEFINE_boolean 'stat' false 'generate diffstat instead of patch' 's'
-  DEFINE_boolean 'mine' false 'limit git-now commits by my name' 'm'
   FLAGS "$@" || exit $?
   eval set -- "${FLAGS_ARGV}"
   # read arguments into global variables
@@ -30,10 +29,6 @@ parse_args() {
   if flag stat; then
     ARGS="${ARGS} --stat"
   fi
-  if flag mine; then
-    AUTHOR=$(escape `git config --get user.name`)
-    ARGS="${ARGS} --author=$AUTHOR"
-  fi
 }
 
 cmd_help() {
@@ -41,4 +36,3 @@ cmd_help() {
   exit 0
 }
 
-# vim: set ff=unix ft=sh :

git-now-push

@@ -1,25 +0,0 @@
-usage() {
-  echo "usage: git now push [<remote-repository>]"
-}
-
-
-cmd_default() {
-  REMOTE=$1
-
-  WORKING_BRANCH=$(git_current_branch)
-
-  if [ -n "$REMOTE" ]; then
-    git pull -q ${REMOTE} ${WORKING_BRANCH}
-    git push ${REMOTE} :${WORKING_BRANCH} && git push ${REMOTE} ${WORKING_BRANCH}
-  else
-    git pull -q origin ${WORKING_BRANCH}
-    git push origin :${WORKING_BRANCH} && git push
-  fi
-}
-
-cmd_help() {
-  usage
-  exit 0
-}
-
-# vim: set ff=unix ft=sh :

git-now-rebase

@@ -1,5 +1,8 @@
 usage() {
-  echo "usage: git now rebase [--mine|-m] [<base-branch>]"
+  echo "usage: git now rebase [<base-branch>]"
+  echo "       git now rebase --push [<base-branch>]"
+  echo "       git now rebase --push --upstream <remote> [<base-branch>]"
+  echo "       git now rebase --push --remove <remote> [<base-branch>]"
 }
 
 
@@ -11,11 +14,7 @@ cmd_default() {
 
   if [ -n "$BASE_BRANCH" ]; then
     COMMON_ANCESTOR_COMMIT=`git merge-base ${BASE_BRANCH} ${WORKING_BRANCH}`
-    if flag mine; then
+    FIRST_NOW_COMMIT=$(git_now_first_commit $COMMON_ANCESTOR_COMMIT)
-      FIRST_NOW_COMMIT=$(git_now_my_first_commit $COMMON_ANCESTOR_COMMIT)
-    else
-      FIRST_NOW_COMMIT=$(git_now_first_commit $COMMON_ANCESTOR_COMMIT)
-    fi
 
     if [ "$FIRST_NOW_COMMIT" != "$INITIAL_COMMIT" ]; then
       git rebase -i ${FIRST_NOW_COMMIT}^
@@ -25,11 +24,7 @@ cmd_default() {
       git rebase --onto HEAD ${FIRST_NOW_COMMIT} ${WORKING_BRANCH}
     fi
   else
-    if flag mine; then
+    FIRST_NOW_COMMIT=$(git_now_first_commit)
-      FIRST_NOW_COMMIT=$(git_now_my_first_commit)
-    else
-      FIRST_NOW_COMMIT=$(git_now_first_commit)
-    fi
 
     if [ "$FIRST_NOW_COMMIT" != "$INITIAL_COMMIT" ]; then
       git rebase -i ${FIRST_NOW_COMMIT}^
@@ -39,6 +34,17 @@ cmd_default() {
       git rebase --onto HEAD ${FIRST_NOW_COMMIT} ${WORKING_BRANCH}
     fi
   fi
+
+  if flag push; then
+    if [ -n "$UPSTREAM_REMOTE" ]; then
+      git push --set-upstream $UPSTREAM_REMOTE $WORKING_BRANCH
+    elif [ -n "$REMOVE_REMOTE" ]; then
+      git push $REMOVE_REMOTE :$WORKING_BRANCH
+      git push
+    else
+      git push
+    fi
+  fi
 }
 
 cmd_help() {
@@ -48,12 +54,15 @@ cmd_help() {
 
 parse_args() {
   # parse options
-  DEFINE_boolean 'mine' false 'limit git-now commits by my name' 'm'
+  DEFINE_boolean 'push' false 'push to remote repository finally' ''
+  DEFINE_string 'remove' '' 'remote name to remove the remote branch before push' ''
+  DEFINE_string 'upstream' '' 'remote name for --set-upstream' ''
   FLAGS "$@" || exit $?
   eval set -- "${FLAGS_ARGV}"
 
   # read arguments into global variables
   BASE_BRANCH=$1
+  UPSTREAM_REMOTE=$FLAGS_upstream
+  REMOVE_REMOTE=$FLAGS_remove
 }
 
-# vim: set ff=unix ft=sh :

git-now.rb

@@ -0,0 +1,17 @@
+require 'formula'
+
+class GitNow < Formula
+  url  'https://github.com/iwata/git-now.git', :tag => 'v0.0.4'
+  version '0.0.4'
+  head 'https://github.com/iwata/git-now.git', :branch => 'develop'
+  homepage 'https://github.com/iwata/git-now'
+
+  # for longopt
+  depends_on 'gnu-getopt'
+
+  def install
+    system "make", "prefix=#{prefix}", "install"
+    system "brew ln gnu-getopt"
+  end
+
+end

gitnow-common

@@ -37,7 +37,7 @@ git_remote_branches() { git branch -r --no-color | sed 's/^[* ] //'; }
 git_all_branches() { ( git branch --no-color; git branch -r --no-color) | sed 's/^[* ] //'; }
 
 git_current_branch() {
-  git rev-parse --abbrev-ref HEAD
+  git branch -l | grep "*" | cut -d " " -f 2
 }
 
 git_now_first_commit() {
@@ -49,16 +49,4 @@ git_now_first_commit() {
   fi
 }
 
-git_now_my_first_commit() {
-  local author=$(escape `git config --get user.name`)
-  local common=$1
-  if [ $# -eq 1 ]; then
-      git log ${common}.. --pretty=oneline --author=${author} --grep="${PREFIX}" | tail -n 1 | cut -d " " -f 1
-  else
-      git log --pretty=oneline --author=${author} --grep="${PREFIX}" | tail -n 1 | cut -d " " -f 1
-  fi
-}
-
 git_now_initial_commit() { git log --pretty=oneline | tail -n 1 | cut -d " " -f 1; }
-
-# vim: set ff=unix ft=sh