mirror of
https://github.com/tj/git-extras.git
synced 2026-09-10 23:46:24 -04:00
Merge pull request #558 from spacewander/fix_legacy_problem
Fix legacy problem
This commit is contained in:
hemanth.hm
GitHub
commit
77036074ef
93
Commands.md
93
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 git@myserver.com: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 git@myserver.com:myuser/myrepository.git
|
||||
* [new tag] test2 -> test2
|
||||
remote: warning: Deleting a non-existent ref.
|
||||
To git@myserver.com:myuser/myrepository.git
|
||||
- [deleted] refs/tag/test
|
||||
$ git tag
|
||||
test2
|
||||
```
|
||||
|
||||
## git alias
|
||||
|
||||
Define, search and show aliases.
|
||||
|
|
@ -653,6 +683,15 @@ nickl- <github@jigsoft.co.za>
|
|||
Leila Muhtasib <muhtasib@gmail.com>
|
||||
```
|
||||
|
||||
## 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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env sh
|
||||
#!/usr/bin/env bash
|
||||
|
||||
hook() {
|
||||
local hook=.git/hooks/$1.sh
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/sh
|
||||
#!/usr/bin/env bash
|
||||
|
||||
usage() {
|
||||
cat <<EOF
|
||||
|
|
|
|||
|
|
@ -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' \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ And it will mess up stash, so <strong>don't have stash when you run <code>git ob
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by <<a href="mailto:brianloveswords@gmail.com" data-bare-link="true">brianloveswords@gmail.com</a>></p>
|
||||
<p>Written by <<a href="mailto:brianloveswords@gmail.com" data-bare-link="true">brianloveswords@gmail.com</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUG">REPORTING BUG</h2>
|
||||
|
||||
|
|
@ -120,7 +120,7 @@ And it will mess up stash, so <strong>don't have stash when you run <code>git ob
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>August 2015</li>
|
||||
<li class='tc'>June 2016</li>
|
||||
<li class='tr'>git-obliterate(1)</li>
|
||||
</ol>
|
||||
|
||||
46
man/git-pull-request.1
Normal file
46
man/git-pull-request.1
Normal file
|
|
@ -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>
|
||||
127
man/git-pull-request.html
Normal file
127
man/git-pull-request.html
Normal file
|
|
@ -0,0 +1,127 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv='content-type' value='text/html;charset=utf8'>
|
||||
<meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
|
||||
<title>git-pull-request(1) - Create pull request for GitHub project</title>
|
||||
<style type='text/css' media='all'>
|
||||
/* style: man */
|
||||
body#manpage {margin:0}
|
||||
.mp {max-width:100ex;padding:0 9ex 1ex 4ex}
|
||||
.mp p,.mp pre,.mp ul,.mp ol,.mp dl {margin:0 0 20px 0}
|
||||
.mp h2 {margin:10px 0 0 0}
|
||||
.mp > p,.mp > pre,.mp > ul,.mp > ol,.mp > dl {margin-left:8ex}
|
||||
.mp h3 {margin:0 0 0 4ex}
|
||||
.mp dt {margin:0;clear:left}
|
||||
.mp dt.flush {float:left;width:8ex}
|
||||
.mp dd {margin:0 0 0 9ex}
|
||||
.mp h1,.mp h2,.mp h3,.mp h4 {clear:left}
|
||||
.mp pre {margin-bottom:20px}
|
||||
.mp pre+h2,.mp pre+h3 {margin-top:22px}
|
||||
.mp h2+pre,.mp h3+pre {margin-top:5px}
|
||||
.mp img {display:block;margin:auto}
|
||||
.mp h1.man-title {display:none}
|
||||
.mp,.mp code,.mp pre,.mp tt,.mp kbd,.mp samp,.mp h3,.mp h4 {font-family:monospace;font-size:14px;line-height:1.42857142857143}
|
||||
.mp h2 {font-size:16px;line-height:1.25}
|
||||
.mp h1 {font-size:20px;line-height:2}
|
||||
.mp {text-align:justify;background:#fff}
|
||||
.mp,.mp code,.mp pre,.mp pre code,.mp tt,.mp kbd,.mp samp {color:#131211}
|
||||
.mp h1,.mp h2,.mp h3,.mp h4 {color:#030201}
|
||||
.mp u {text-decoration:underline}
|
||||
.mp code,.mp strong,.mp b {font-weight:bold;color:#131211}
|
||||
.mp em,.mp var {font-style:italic;color:#232221;text-decoration:none}
|
||||
.mp a,.mp a:link,.mp a:hover,.mp a code,.mp a pre,.mp a tt,.mp a kbd,.mp a samp {color:#0000ff}
|
||||
.mp b.man-ref {font-weight:normal;color:#434241}
|
||||
.mp pre {padding:0 4ex}
|
||||
.mp pre code {font-weight:normal;color:#434241}
|
||||
.mp h2+pre,h3+pre {padding-left:0}
|
||||
ol.man-decor,ol.man-decor li {margin:3px 0 10px 0;padding:0;float:left;width:33%;list-style-type:none;text-transform:uppercase;color:#999;letter-spacing:1px}
|
||||
ol.man-decor {width:100%}
|
||||
ol.man-decor li.tl {text-align:left}
|
||||
ol.man-decor li.tc {text-align:center;letter-spacing:4px}
|
||||
ol.man-decor li.tr {text-align:right;float:right}
|
||||
</style>
|
||||
</head>
|
||||
<!--
|
||||
The following styles are deprecated and will be removed at some point:
|
||||
div#man, div#man ol.man, div#man ol.head, div#man ol.man.
|
||||
|
||||
The .man-page, .man-decor, .man-head, .man-foot, .man-title, and
|
||||
.man-navigation should be used instead.
|
||||
-->
|
||||
<body id='manpage'>
|
||||
<div class='mp' id='man'>
|
||||
|
||||
<div class='man-navigation' style='display:none'>
|
||||
<a href="#NAME">NAME</a>
|
||||
<a href="#SYNOPSIS">SYNOPSIS</a>
|
||||
<a href="#DESCRIPTION">DESCRIPTION</a>
|
||||
<a href="#OPTIONS">OPTIONS</a>
|
||||
<a href="#EXAMPLES">EXAMPLES</a>
|
||||
<a href="#AUTHOR">AUTHOR</a>
|
||||
<a href="#REPORTING-BUGS">REPORTING BUGS</a>
|
||||
<a href="#SEE-ALSO">SEE ALSO</a>
|
||||
</div>
|
||||
|
||||
<ol class='man-decor man-head man head'>
|
||||
<li class='tl'>git-pull-request(1)</li>
|
||||
<li class='tc'></li>
|
||||
<li class='tr'>git-pull-request(1)</li>
|
||||
</ol>
|
||||
|
||||
<h2 id="NAME">NAME</h2>
|
||||
<p class="man-name">
|
||||
<code>git-pull-request</code> - <span class="man-whatis">Create pull request for GitHub project</span>
|
||||
</p>
|
||||
|
||||
<h2 id="SYNOPSIS">SYNOPSIS</h2>
|
||||
|
||||
<p><code>git-pull-request</code> [<target branch>]</p>
|
||||
|
||||
<h2 id="DESCRIPTION">DESCRIPTION</h2>
|
||||
|
||||
<p>Create pull request for a project on GitHub via commandline.</p>
|
||||
|
||||
<h2 id="OPTIONS">OPTIONS</h2>
|
||||
|
||||
<p><target branch></p>
|
||||
|
||||
<p>The target branch you want to send pull request to.</p>
|
||||
|
||||
<h2 id="EXAMPLES">EXAMPLES</h2>
|
||||
|
||||
<pre><code>$ 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':
|
||||
...
|
||||
</code></pre>
|
||||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Tj Holowaychuk <<a href="mailto:tj@vision-media.ca" data-bare-link="true">tj@vision-media.ca</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
<p><<a href="https://github.com/tj/git-extras/issues" data-bare-link="true">https://github.com/tj/git-extras/issues</a>></p>
|
||||
|
||||
<h2 id="SEE-ALSO">SEE ALSO</h2>
|
||||
|
||||
<p><<a href="https://github.com/tj/git-extras" data-bare-link="true">https://github.com/tj/git-extras</a>></p>
|
||||
|
||||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>July 2016</li>
|
||||
<li class='tr'>git-pull-request(1)</li>
|
||||
</ol>
|
||||
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
44
man/git-pull-request.md
Normal file
44
man/git-pull-request.md
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
git-pull-request(1) -- Create pull request for GitHub project
|
||||
================================
|
||||
|
||||
## SYNOPSIS
|
||||
|
||||
`git-pull-request` [<target branch>]
|
||||
|
||||
## DESCRIPTION
|
||||
|
||||
Create pull request for a project on GitHub via commandline.
|
||||
|
||||
## OPTIONS
|
||||
|
||||
<target branch>
|
||||
|
||||
The target branch you want to send pull request to.
|
||||
|
||||
## EXAMPLES
|
||||
|
||||
```
|
||||
$ 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':
|
||||
...
|
||||
```
|
||||
|
||||
## AUTHOR
|
||||
|
||||
Written by Tj Holowaychuk <<tj@vision-media.ca>>
|
||||
|
||||
## REPORTING BUGS
|
||||
|
||||
<<https://github.com/tj/git-extras/issues>>
|
||||
|
||||
## SEE ALSO
|
||||
|
||||
<<https://github.com/tj/git-extras>>
|
||||
Loading…
Reference in a new issue