Merge pull request #558 from spacewander/fix_legacy_problem

Fix legacy problem

Commands.md

@@ -2,6 +2,7 @@
  - [`git alias`](#git-alias)
  - [`git archive-file`](#git-archive-file)
  - [`git authors`](#git-authors)
+ - [`git back`](#git-back)
  - [`git changelog`](#git-changelog)
  - [`git clear`](#git-clear)
  - [`git clear-soft`](#git-clear-soft)
@@ -35,13 +36,19 @@
  - [`git obliterate`](#git-obliterate)
  - [`git pr`](#git-pr)
  - [`git psykorebase`](#git-psykorebase)
+ - [`git pull-request`](#git-pull-request)
+ - [`git rebase-patch`](#git-rebase-patch)
  - [`git release`](#git-release)
+ - [`git rename-tag`](#git-rename-tag)
  - [`git repl`](#git-repl)
  - [`git reset-file`](#git-reset-file)
  - [`git root`](#git-root)
  - [`git scp`](#git-scp)
  - [`git sed`](#git-sed)
  - [`git setup`](#git-setup)
+ - [`git show-merged-branches`](#git-show-merged-branches)
+ - [`git show-unmerged-branches`](#git-show-unmerged-branches)
+ - [`git show-tree`](#git-show-tree)
  - [`git standup`](#git-standup)
  - [`git squash`](#git-squash)
  - [`git summary`](#git-summary)
@@ -340,6 +347,29 @@ Does the following:
   - Push the branch / tags
   - Executes _.git/hooks/post-release.sh_ (if present)
 
+## git rename-tag
+
+Rename a tag (locally and remotely).
+```
+$ git tag test
+$ git push --tags
+Total 0 (delta 0), reused 0 (delta 0)
+To [email protected]:myuser/myrepository.git
+    * [new tag]         test -> test
+$ git tag
+test
+$ git rename-tag test test2
+Deleted tag 'test' (was 1111111)
+Total 0 (delta 0), reused 0 (delta 0)
+To [email protected]:myuser/myrepository.git
+    * [new tag]         test2 -> test2
+remote: warning: Deleting a non-existent ref.
+To [email protected]:myuser/myrepository.git
+    - [deleted]         refs/tag/test
+$ git tag
+test2
+```
+
 ## git alias
 
 Define, search and show aliases.
@@ -653,6 +683,15 @@ nickl- <[email protected]>
 Leila Muhtasib <[email protected]>
 ```
 
+## git back
+
+Removes the latest commits, and add their changes to your staging area.
+
+```
+$ git back # Removes the latest commit.
+$ git back 3 # Remove the latest 3 commits.
+```
+
 ## git changelog
 
 Generates a changelog from git(1) tags (annotated or lightweight) and commit messages. Existing changelog files with filenames that begin with _Change_ or _History_ will be identified automatically with a case insensitive match pattern and existing content will be appended to the new output generated--this behavior can be disabled by specifying the prune option (-p|--prune-old). The generated file will be opened in **$EDITOR** when set.
@@ -795,6 +834,37 @@ Internally this script uses `rsync` and not `scp` as the name suggests.
 
     $ git scp staging js/vendor/
 
+## git show-merged-branches
+
+Show all branches merged in to current HEAD.
+
+## git show-unmerged-branches
+
+Show all branches **not** merged in to current HEAD.
+
+## git show-tree
+
+Show the decorated graph view of one liner summarized commits from all branches.
+For example, running `git show-tree` will display:
+```
+*   4b57684 (HEAD, develop) Merge branch upstream master.
+|\
+| *   515e94a Merge pull request #128 from nickl-/git-extras-html-hyperlinks
+| |\
+| | * 815db8b (nickl/git-extras-html-hyperlinks, git-extras-html-hyperlinks) help ronn make hyperlinks.
+| * | 7398d10 (nickl/develop) Fix #127 git-ignore won't add duplicates.
+| |/
+| | * ab72c1e (refs/stash) WIP on develop: 5e943f5 Fix #127 git-ignore won't add duplicates.
+| |/
+|/|
+* | 730ca89 (bolshakov) Rebase bolshakov with master
+|/
+* 60f8371 (origin/master, origin/HEAD, master) Merge pull request #126 from agrimaldi/fix-changelog-last-tag
+...
+```
+
+Be free to try it for yourself!
+
 ## git standup
 
 Recall what you did or find what someone else did in a given range of time.
@@ -1002,6 +1072,29 @@ $ git psykorebase master feature
 
 The above rebase `feature` branch on top of `master` branch
 
+## git pull-request
+
+Create pull request via commandline.
+
+## git rebase-patch
+
+Given  you have a patch that doesn´t apply to the current HEAD, but you know it applied to some commit in the past, 
+`git rebase-patch` will help you find that commit and do a rebase.
+
+For example,
+```
+$ git rebase-patch test.patch
+Trying to find a commit the patch applies to...
+Patch applied to dbcf408dd26 as 7dc8b23ae1a
+First, rewinding head to replay your work on top of it...
+Applying: test.patch
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging README.txt
+```
+
+Then your last commit has the changes of the patch and is named `test.patch`.
+
 ## git sync
 
 Sync local branch with its remote branch

bin/git-fork

@@ -20,7 +20,7 @@ read user
 # extract owner + project from repo url
 project=${url##*/}
 owner=${url%/$project}
-[[ $project == *.git ]] && project=${project%.git}
+project=${project%.git}
 if [[ $owner == git@* ]]; then
   owner=${owner##*:}
 else

bin/git-pull-request

@@ -39,7 +39,13 @@ git push origin $branch || abort "failed to push $branch"
 
 # lame hack to get project
 
-project=$(git config remote.origin.url | sed 's/^.*://' | sed 's/\.git$//')
+origin=$(git config remote.origin.url)
+if [[ $origin == git@* ]]; then
+    project=${origin##*:}
+else
+    project=${origin#https://*/}
+fi
+project=${project%.git}
 
 # prompt
 

bin/git-release

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 hook() {
   local hook=.git/hooks/$1.sh

bin/git-sed

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 usage() {
     cat <<EOF

etc/git-extras-completion.zsh

@@ -389,6 +389,7 @@ zstyle ':completion:*:*:git:*' user-commands \
     obliterate:'rewrite past commits to remove some files' \
     pr:'checks out a pull request locally' \
     psykorebase:'rebase a branch with a merge commit' \
+    pull-request:'create pull request to GitHub project' \
     rebase-patch:'rebases a patch' \
     refactor:'create refactor branch' \
     release:'commit, tag and push changes to the repository' \

man/git-obliterate.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-OBLITERATE" "1" "August 2015" "" ""
+.TH "GIT\-OBLITERATE" "1" "June 2016" "" ""
 .
 .SH "NAME"
 \fBgit\-obliterate\fR \- rewrite past commits to remove some files

man/git-pull-request.1

@@ -0,0 +1,46 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "GIT\-PULL\-REQUEST" "1" "July 2016" "" ""
+.
+.SH "NAME"
+\fBgit\-pull\-request\fR \- Create pull request for GitHub project
+.
+.SH "SYNOPSIS"
+\fBgit\-pull\-request\fR [<target branch>]
+.
+.SH "DESCRIPTION"
+Create pull request for a project on GitHub via commandline\.
+.
+.SH "OPTIONS"
+<target branch>
+.
+.P
+The target branch you want to send pull request to\.
+.
+.SH "EXAMPLES"
+.
+.nf
+
+$ git pull\-request master
+Everything up\-to\-date
+
+  create pull\-request for spacewander/spacewander\-toolbox \'master\'
+
+  title: test
+  body:
+  base [master]:
+
+Enter host password for user \'spacewanderlzx@gmail\.com\':
+\.\.\.
+.
+.fi
+.
+.SH "AUTHOR"
+Written by Tj Holowaychuk <\fItj@vision\-media\.ca\fR>
+.
+.SH "REPORTING BUGS"
+<\fIhttps://github\.com/tj/git\-extras/issues\fR>
+.
+.SH "SEE ALSO"
+<\fIhttps://github\.com/tj/git\-extras\fR>