mirror of
https://github.com/tj/git-extras.git
synced 2026-09-14 17:36:25 -04:00
Lee Wei
commit
56a2e27910
157
AUTHORS
157
AUTHORS
|
|
@ -3,31 +3,146 @@ various contributors:
|
|||
|
||||
Development Lead
|
||||
````````````````
|
||||
|
||||
- TJ Holowaychuk <tj@vision-media.ca>
|
||||
|
||||
Maintainer
|
||||
````````````````
|
||||
Maintainers
|
||||
```````````
|
||||
- Hemanth.HM <hemanth.hm@gmail.com>
|
||||
- Nimit Kalra <me@nimit.io>
|
||||
|
||||
Patches and Suggestions
|
||||
```````````````````````
|
||||
|
||||
- Mark Eissler
|
||||
- Chern Jie
|
||||
- Kenneth Reitz
|
||||
- Aggelos Orfanakos
|
||||
- Jonathan "Duke" Leto
|
||||
- Domenico Rotiroti
|
||||
- Jason Young
|
||||
- Nick Campbell
|
||||
- Jonhnny Weslley
|
||||
- Alex McHale
|
||||
- Gert Van Gool
|
||||
- Devin Withers
|
||||
- David Baumgold
|
||||
- Leila Muhtasib
|
||||
- Nicolai Skogheim <nicolai.skogheim@gmail.com>
|
||||
- Jonhnny Weslley <jw@jonhnnyweslley.net>
|
||||
- spacewander <spacewanderlzx@gmail.com>
|
||||
- LeeW <cl87654321@gmail.com>
|
||||
- nickl- <github@jigsoft.co.za>
|
||||
- CJ <lim@chernjie.com>
|
||||
- timfeirg <kkcocogogo@gmail.com>
|
||||
- Mark Eissler <mark@mixtur.com>
|
||||
- Leila Muhtasib <muhtasib@gmail.com>
|
||||
- Jesús Espino <jesus.espino@kaleidos.net>
|
||||
- Jan Schulz <jasc@gmx.net>
|
||||
- David Baumgold <david@davidbaumgold.com>
|
||||
- Andrew Janke <andrew@apjanke.net>
|
||||
- Kenneth Reitz <me@kennethreitz.com>
|
||||
- Sasha Khamkov <sanusart@gmail.com>
|
||||
- Damian Krzeminski <dkrzemin@gmail.com>
|
||||
- Aggelos Orfanakos <agorf@agorf.gr>
|
||||
- grindhold <grindhold@gmx.net>
|
||||
- Camille Reynders <camille.reynders@ibbt.be>
|
||||
- NANRI <southly@gmail.com>
|
||||
- Chris Hall <christopher.k.hall@gmail.com>
|
||||
- Phally <info@frankdegraaf.net>
|
||||
- Rémy HUBSCHER <rhubscher@mozilla.com>
|
||||
- Rico Sta. Cruz <rstacruz@users.noreply.github.com>
|
||||
- Alexander Krasnukhin <the.malkolm@gmail.com>
|
||||
- Takuma Yamaguchi <kumon0587@gmail.com>
|
||||
- gisphm <phmfk@hotmail.com>
|
||||
- wooorm <tituswormer@gmail.com>
|
||||
- Philipp Klose <me@thehippo.de>
|
||||
- Jonathan "Duke" Leto <jonathan@leto.net>
|
||||
- Nils Winkler <nils@nilswinkler.com>
|
||||
- Ivan Malopinsky <ivan@imsky.org>
|
||||
- Julio Napurí <julionc@gmail.com>
|
||||
- Hogan Long <hoganlong@gmail.com>
|
||||
- Brian J Brennan <brianloveswords@gmail.com>
|
||||
- Gert Van Gool <gertvangool@gmail.com>
|
||||
- Curtis McEnroe <programble@gmail.com>
|
||||
- Nate Jones <nate@endot.org>
|
||||
- Newell Zhu <zlx.star@gmail.com>
|
||||
- Patryk Małek <malekpatryk@gmail.com>
|
||||
- Paul Schreiber <paul.schreiber@espn.com>
|
||||
- Andre Cerqueira <me@andrecerqueira.com>
|
||||
- Richard Littauer <richard.littauer@gmail.com>
|
||||
- Jean Jordaan <jean.jordaan@gmail.com>
|
||||
- Alexis GRIMALDI <alexis.grimaldi@gmail.com>
|
||||
- David Rogers <hello@al-the-x.me>
|
||||
- Devin Withers <dwithers@kionix.com>
|
||||
- Tom Vincent <git@tlvince.com>
|
||||
- Domenico Rotiroti <drotiro@tiscali.it>
|
||||
- Wil Moore III <wil.moore@wilmoore.com>
|
||||
- Justin Guenther <jguenther@gmail.com>
|
||||
- go2null <1t1is2@gmail.com>
|
||||
- Evan Grim <evan@mirgnave.com>
|
||||
- Kylie McClain <somasissounds@gmail.com>
|
||||
- luozexuan <zexuan.lzx@alibaba-inc.com>
|
||||
- Florian H <jscoderr@gmail.com>
|
||||
- Guillaume Seren <guillaumeseren@gmail.com>
|
||||
- phigoro <phigoro@users.noreply.github.com>
|
||||
- soffolk <lianxin.zhu@easyread.ly>
|
||||
- Marc Harter <wavded@gmail.com>
|
||||
- Xiaopei Li <toksea@gmail.com>
|
||||
- creynders <camille.reynders@gmail.com>
|
||||
- dead-horse <dead_horse@qq.com>
|
||||
- eszabpt <peter.szabados@ericsson.com>
|
||||
- jykntr <jykntr@gmail.com>
|
||||
- meza <meza@meza.hu>
|
||||
- neydroid <joseneyguerrero@gmail.com>
|
||||
- nulltask <nulltask@gmail.com>
|
||||
- zeroDivisible <zerodivisible@gmail.com>
|
||||
- Adam Parkin <aparkin@seekersolutions.com>
|
||||
- ☃ pitr <pitr.vern@gmail.com>
|
||||
- Akim Demaille <akim@lrde.epita.fr>
|
||||
- Alex McHale <alexmchale@gmail.com>
|
||||
- Allan Odgaard <github@simplit.com>
|
||||
- Amir Tocker <tocker.signup@gmail.com>
|
||||
- Andrei Petcu <andreicristianpetcu@gmail.com>
|
||||
- Andrew Starr-Bochicchio <a.starr.b@gmail.com>
|
||||
- Andy <mail@andrewgriffithsonline.com>
|
||||
- Antoine Beaupré <anarcat@koumbit.org>
|
||||
- Aurélien Scoubeau <aurelien.scoubeau@gmail.com>
|
||||
- Balazs Nadasdi <yitsushi@gmail.com>
|
||||
- Ben Parnell <benjaminparnell.94@gmail.com>
|
||||
- Brandon Zylstra <brandon.zylstra@gmail.com>
|
||||
- Bruno Sutic <bruno.sutic@gmail.com>
|
||||
- Carl Casbolt <carl.casbolt@gmail.com>
|
||||
- Ciro Nunes <ciroanunes@gmail.com>
|
||||
- Craig MacGregor <craigerm@gmail.com>
|
||||
- Dan Jackson <e28eta@yahoo.com>
|
||||
- Daniel Schildt <daniel@autiomaa.org>
|
||||
- Dave James Miller <dave@davejamesmiller.com>
|
||||
- David Hartmann <dh@thesilverlogic.com>
|
||||
- Dung Quang <nxqd.inbox+rhacker@gmail.com>
|
||||
- Emil Kjelsrud <emilkje@gmail.com>
|
||||
- Greg Allen <me@jga.me>
|
||||
- Guillermo Rauch <rauchg@gmail.com>
|
||||
- Gunnlaugur Thor Briem <gunnlaugur@gmail.com>
|
||||
- James Manning <james.manning@gmail.com>
|
||||
- Jan Krueger <jan278@googlemail.com>
|
||||
- Jarod Stewart <StewartJarod@users.noreply.github.com>
|
||||
- Jason Young <a.young.jason@gmail.com>
|
||||
- Jens K. Mueller <jkm@gluey.org>
|
||||
- Jesse Sipprell <jsipprell@mcclatchyinteractive.com>
|
||||
- Jianjin Fan <fanjianjin@xiaomi.com>
|
||||
- Johannes Ewald <johannes.ewald@peerigon.com>
|
||||
- John Hoffmann <jhoffmann@sugarcrm.com>
|
||||
- Jon Ander Peñalba <jonander.penalba@ticketbis.com>
|
||||
- Joshua Appelman <jappelman@xebia.com>
|
||||
- Kevin Woo <kevinawoo@gmail.com>
|
||||
- Konstantin Schukraft <konstantin@schukraft.org>
|
||||
- Leandro López <inkel.ar@gmail.com>
|
||||
- Maarten Winter <mw@one.com>
|
||||
- Mathieu D. (MatToufoutu) <mattoufootu@gmail.com>
|
||||
- Matt Colyer <matt@colyer.name>
|
||||
- Matthew Avant <mavant@palantir.com>
|
||||
- Michael Komitee <mkomitee@gmail.com>
|
||||
- Michael Matuzak <michael@lambdaphant.com>
|
||||
- Moritz Grauel <mo@notadomain.com>
|
||||
- Nathan Rajlich <nathan@tootallnate.net>
|
||||
- Nick Campbell <ncampbell@siteworx.com>
|
||||
- Nick Payne <nick@kurai.co.uk>
|
||||
- Niklas Fiekas <niklas.fiekas@googlemail.com>
|
||||
- Raphael Fleischlin <raphael.fleischlin@gmail.com>
|
||||
- Rasmus Wriedt Larsen <rasmuswriedtlarsen@gmail.com>
|
||||
- Riceball LEE <snowyu.lee@gmail.com>
|
||||
- Rob Kennedy <kennedyri@gmail.com>
|
||||
- Ryan Bohn <rbohn@biohitech.com>
|
||||
- Sam Thursfield <sam.thursfield@codethink.co.uk>
|
||||
- Stephen Mathieson <smath23@gmail.com>
|
||||
- Steve Mao <maochenyan@gmail.com>
|
||||
- Todd Wolfson <todd@twolfson.com>
|
||||
- Tony <zearin@gonk.net>
|
||||
- TweeKane <tweekane@gmail.com>
|
||||
- Valérian Galliat <val@codejam.info>
|
||||
- Duane Johnson
|
||||
- Todd Wolfson
|
||||
- Niklas Fiekas
|
||||
- Paul Schreiber
|
||||
|
|
|
|||
88
Commands.md
88
Commands.md
|
|
@ -1,50 +1,52 @@
|
|||
|
||||
- [`git extras`](#git-extras)
|
||||
- [`git squash`](#git-squash)
|
||||
- [`git summary`](#git-summary)
|
||||
- [`git line-summary`](#git-line-summary)
|
||||
- [`git effort`](#git-effort)
|
||||
- [`git alias`](#git-alias)
|
||||
- [`git archive-file`](#git-archive-file)
|
||||
- [`git authors`](#git-authors)
|
||||
- [`git changelog`](#git-changelog)
|
||||
- [`git clear`](#git-clear)
|
||||
- [`git commits-since`](#git-commits-since)
|
||||
- [`git contrib`](#git-contrib)
|
||||
- [`git count`](#git-count)
|
||||
- [`git create-branch`](#git-create-branch)
|
||||
- [`git delete-branch`](#git-delete-branch)
|
||||
- [`git delete-merged-branches`](#git-delete-merged-branches)
|
||||
- [`git delete-submodule`](#git-delete-submodule)
|
||||
- [`git delete-tag`](#git-delete-tag)
|
||||
- [`git delete-merged-branches`](#git-delete-merged-branches)
|
||||
- [`git delta`](#git-delta)
|
||||
- [`git effort`](#git-effort)
|
||||
- [`git extras`](#git-extras)
|
||||
- [`git feature|refactor|bug|chore`](#git-featurerefactorbugchore)
|
||||
- [`git fork`](#git-fork)
|
||||
- [`git fresh-branch`](#git-fresh-branch)
|
||||
- [`git guilt`](#git-guilt)
|
||||
- [`git merge-into`](#git-merge-into)
|
||||
- [`git gh-pages`](#git-gh-pages)
|
||||
- [`git graft`](#git-graft)
|
||||
- [`git alias`](#git-alias)
|
||||
- [`git guilt`](#git-guilt)
|
||||
- [`git ignore`](#git-ignore)
|
||||
- [`git ignore-io`](#git-ignore-io)
|
||||
- [`git info`](#git-info)
|
||||
- [`git fork`](#git-fork)
|
||||
- [`git release`](#git-release)
|
||||
- [`git contrib`](#git-contrib)
|
||||
- [`git repl`](#git-repl)
|
||||
- [`git undo`](#git-undo)
|
||||
- [`git gh-pages`](#git-gh-pages)
|
||||
- [`git scp`](#git-scp)
|
||||
- [`git setup`](#git-setup)
|
||||
- [`git touch`](#git-touch)
|
||||
- [`git obliterate`](#git-obliterate)
|
||||
- [`git feature|refactor|bug|chore`](#git-featurerefactorbugchore)
|
||||
- [`git line-summary`](#git-line-summary)
|
||||
- [`git local-commits`](#git-local-commits)
|
||||
- [`git archive-file`](#git-archive-file)
|
||||
- [`git missing`](#git-missing)
|
||||
- [`git lock`](#git-lock)
|
||||
- [`git locked`](#git-locked)
|
||||
- [`git unlock`](#git-unlock)
|
||||
- [`git reset-file`](#git-reset-file)
|
||||
- [`git pr`](#git-pr)
|
||||
- [`git root`](#git-root)
|
||||
- [`git delta`](#git-delta)
|
||||
- [`git merge-into`](#git-merge-into)
|
||||
- [`git merge-repo`](#git-merge-repo)
|
||||
- [`git missing`](#git-missing)
|
||||
- [`git obliterate`](#git-obliterate)
|
||||
- [`git pr`](#git-pr)
|
||||
- [`git psykorebase`](#git-psykorebase)
|
||||
- [`git release`](#git-release)
|
||||
- [`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 squash`](#git-squash)
|
||||
- [`git summary`](#git-summary)
|
||||
- [`git sync`](#git-sync)
|
||||
- [`git touch`](#git-touch)
|
||||
- [`git undo`](#git-undo)
|
||||
- [`git unlock`](#git-unlock)
|
||||
|
||||
## git extras
|
||||
|
||||
|
|
@ -73,7 +75,7 @@ Sets up the `gh-pages` branch. (See [GitHub Pages](http://pages.github.com/) do
|
|||
|
||||
## git feature|refactor|bug|chore
|
||||
|
||||
Create the given feature, refactor, bug or chore branch `name`:
|
||||
Create/Merge the given feature, refactor, bug or chore branch `name`:
|
||||
|
||||
```bash
|
||||
$ git feature dependencies
|
||||
|
|
@ -749,6 +751,10 @@ Remove the latest 3 commits:
|
|||
git undo 3
|
||||
```
|
||||
|
||||
## git sed
|
||||
|
||||
Run grep as directed but replace the given files with the pattern.
|
||||
|
||||
## git setup
|
||||
|
||||
Set up a git repository (if one doesn't exist), add all files, and make an initial commit. `dir` defaults to the current working directory.
|
||||
|
|
@ -895,6 +901,15 @@ From https://github.com/tj/git-extras
|
|||
Switched to branch 'pr/226'
|
||||
```
|
||||
|
||||
You can also checkout a pull request based on a GitHub url
|
||||
|
||||
```bash
|
||||
$ git pr https://github.com/tj/git-extras/pull/453
|
||||
From https://github.com/tj/git-extras
|
||||
* [new ref] refs/pull/453/head -> pr/453
|
||||
Switched to branch 'pr/453'
|
||||
```
|
||||
|
||||
To remove all local pull request branches, provide the magic `clean` parameter:
|
||||
|
||||
```bash
|
||||
|
|
@ -931,7 +946,7 @@ Makefile
|
|||
README.md
|
||||
```
|
||||
|
||||
## git-clear
|
||||
## git clear
|
||||
|
||||
Does a hard reset and deletes all untracked files from the working directory
|
||||
|
||||
|
|
@ -973,3 +988,18 @@ $ git psykorebase master feature
|
|||
```
|
||||
|
||||
The above rebase `feature` branch on top of `master` branch
|
||||
|
||||
## git sync
|
||||
|
||||
Sync local branch with its remote branch
|
||||
|
||||
```bash
|
||||
$ git sync
|
||||
```
|
||||
|
||||
Sync local branch with origin/master
|
||||
|
||||
```bash
|
||||
$ git sync origin master
|
||||
```
|
||||
|
||||
|
|
|
|||
255
History.md
255
History.md
|
|
@ -1,4 +1,259 @@
|
|||
|
||||
4.1.0 / 2016-01-25
|
||||
==================
|
||||
|
||||
* Merge pull request #503 from spacewander/fix_502
|
||||
* Merge pull request #507 from rstacruz/git-pr-manual
|
||||
* Regerenate git-pr.html
|
||||
* Merge pull request #506 from rstacruz/git-pr-manual
|
||||
* Update git PR manual to mention URLs
|
||||
* handle GIT_EDITOR which contains space
|
||||
* use ps -f and awk to emulate pgrep
|
||||
* Merge pull request #500 from kumon/master
|
||||
* add upstream check & bugfix
|
||||
* add example of git-sync
|
||||
* upstream is used by default
|
||||
* Merge pull request #497 from JanSchulz/win_inst2
|
||||
* add git-sync
|
||||
* Merge pull request #499 from tj/add-bsd-installation
|
||||
* Add BSD installation instructions.
|
||||
* installation.md: Update information about column.exe
|
||||
* install.cmd: add a check for write rights to the install folder
|
||||
* install.cmd: properly escape the ! in the shebang line
|
||||
* Merge pull request #496 from JanSchulz/win_inst
|
||||
* Make the win installer more robust
|
||||
* Merge pull request #494 from apjanke/fix-git-repo-inclusion
|
||||
* Merge pull request #495 from JanSchulz/patch-1
|
||||
* Update Installation.md
|
||||
* Makefile: fix inverted list of commands that use is_git_repo
|
||||
* Add Gitter badge.
|
||||
* Bump version to 4.1.0-dev.
|
||||
|
||||
4.0.0 / 2015-12-28
|
||||
==================
|
||||
|
||||
* Add David Rogers to AUTHORS.
|
||||
* Merge pull request #481 from al-the-x/multi-file-touch
|
||||
* Better USAGE message
|
||||
* Touch multiple files supplied
|
||||
* Use `$@` instead of `$*` re #467
|
||||
* Update AUTHORS.
|
||||
* Merge pull request #490 from apjanke/etc-under-prefix
|
||||
* installation: put $SYSCONFDIR (/etc) under $PREFIX by default
|
||||
* Merge pull request #489 from apjanke/customize-etcdir
|
||||
* Makefile: allow customizing of SYSCONFDIR (/etc) location
|
||||
* Merge pull request #488 from apjanke/git-clear-shebang
|
||||
* Fix missing shebang in git-clear and missing +x on others
|
||||
* Update all man pages.
|
||||
* Merge pull request #479 from JanSchulz/global_gitignore
|
||||
* Merge pull request #448 from Lee-W/master
|
||||
* Add more info how to set global gitignore
|
||||
* Regenerate git-changelog man pages (.html and .1) for #471.
|
||||
* Merge pull request #471 from JanSchulz/merge-changelog
|
||||
* git-changelog: option to only use merges
|
||||
* Merge pull request #469 from JanSchulz/windows-install
|
||||
* Merge pull request #468 from spacewander/use-real-purplish
|
||||
* Use the default installation path in install.cmd
|
||||
* use real purplish
|
||||
* Merge pull request #466 from anarcat/master
|
||||
* Merge pull request #465 from spacewander/fix-color
|
||||
* add simple sed command
|
||||
* disable color if the output is not printed to tty
|
||||
* replace wildcard '?' to literal '?'
|
||||
* git-scp: use portable terminal escape sequences
|
||||
* Merge pull request #460 from apjanke/summary-defensive-locale
|
||||
* Merge pull request #458 from apjanke/makefile-refactor-libs
|
||||
* Merge pull request #459 from apjanke/effort-portable-colors
|
||||
* git-summary: protect against character encoding issues with LC_ALL=C
|
||||
* git-effort: use portable terminal escape sequences
|
||||
* Makefile: refactor is-git-repo inclusion logic
|
||||
* Merge pull request #454 from apjanke/makefile-escape-mktemp
|
||||
* Makefile: escape $ used inside eval as shell variable
|
||||
* Merge pull request #453 from jhnns/pr-url
|
||||
* Add possibility to also checkout pull requests based on GitHub urls
|
||||
* Merge pull request #452 from akimd/summary-locale
|
||||
* summary: beware of locale issues, and pass options to line-summary
|
||||
* Merge pull request #443 from Natim/patch-1
|
||||
* Merge pull request #444 from spacewander/install_without_alias
|
||||
* Merge pull request #446 from ssssam/fix-active-days
|
||||
* Merge pull request #447 from RichardLitt/patch-1
|
||||
* Update git-ignore-io mannual
|
||||
* Replace "export" option with "replace" in git-ignore-io
|
||||
* Remove exclamation mark
|
||||
* Remove warning when search without word.
|
||||
* Fix typo
|
||||
* Add warning when there is not argument after search, append and export
|
||||
* Fix ~/.gi_list not exist problem
|
||||
* Alphabetized list
|
||||
* effort, summary: Correctly estimate the number of active days
|
||||
* Merge pull request #445 from nicolaiskogheim/straighten-up-effort
|
||||
* effort: change order of arguments to function
|
||||
* effort: add usage message
|
||||
* effort: More robust argument parsing
|
||||
* add alias conflict prompt
|
||||
* Merge pull request #440 from spacewander/features/feature-alias
|
||||
* Add full name for list option
|
||||
* Fix usage error
|
||||
* Make sure git-authors doesn't return twice the same one.
|
||||
* update git-feature docs
|
||||
* add alias to git-feature
|
||||
* Modify print_last_modified_time to make it Linux compatible
|
||||
* Merge pull request #441 from spacewander/features/remove-checkout
|
||||
* Merge branch 'master' of https://github.com/Lee-W/git-extras
|
||||
* Fix doc error for git-ignore-io
|
||||
* Fix doc error for git-ignore-io
|
||||
* Remove redundant \n in tr
|
||||
* Not to update list each time git-ignore-io is executed
|
||||
* Refactor git-ignore-io and remove .gitignore
|
||||
* Update manual and description in Commands
|
||||
* remove duplicate checkout
|
||||
* Generate manual using ronn for git-ignore-io
|
||||
* Finish manual for git-ignore-io
|
||||
* Fix typo
|
||||
* Add description to Commands.md for git-ignore-io
|
||||
* Implement search function or git-ignore-io
|
||||
* Remove help from git-ignore-io
|
||||
* Init gitignore and ignore vim osx temp files
|
||||
* Merge gi_extension project into git extras as git-ignore-io
|
||||
* Merge pull request #436 from nwinkler/patch-1
|
||||
* Merge pull request #437 from nwinkler/patch-2
|
||||
* Fixed typo in install.sh
|
||||
* Updated documentation for git-ignore
|
||||
* Merge pull request #435 from nwinkler/patch-1
|
||||
* Added details to git-pr documentation
|
||||
* Merge pull request #433 from grindhold/git-clear
|
||||
* made more precise security-question.
|
||||
* more concise implementation of git-clear
|
||||
* Fix typo in variable name
|
||||
* added git-clear to Commands.md
|
||||
* added manpage for git-clear
|
||||
* implemented git-clear
|
||||
* Merge pull request #432 from stevemao/patch-1
|
||||
* fix link of `git feature|refactor|bug|chore`
|
||||
* Merge pull request #425 from nicolaiskogheim/makefile-fix
|
||||
* Mark default task as .PHONY
|
||||
* Merge pull request #430 from spacewander/git-extras
|
||||
* make it possible to update via `git extras`
|
||||
* Merge pull request #428 from spacewander/update-commands
|
||||
* Merge pull request #429 from nicolaiskogheim/merge-into-ff-only
|
||||
* merge-into: change --ff option to --ff-only. fix #421
|
||||
* update Commands.md
|
||||
* Merge pull request #411 from Natim/add-psykorebase-command
|
||||
* Improve man page presentation.
|
||||
* Add documentation.
|
||||
* Merge pull request #426 from spacewander/update-for-new-version
|
||||
* change 'search-term' to 'search-pattern'
|
||||
* abort git-alias when too many arguments given.
|
||||
* Merge pull request #423 from nicolaiskogheim/effort-paths
|
||||
* Merge pull request #424 from nicolaiskogheim/fork-docs
|
||||
* Merge pull request #422 from nicolaiskogheim/effort-bugfix
|
||||
* effort docs: add note about omitting unsorted results
|
||||
* effort docs: add example with directories
|
||||
* effort docs: filename -> path
|
||||
* effort docs: Adjust numbers in example
|
||||
* effort: rename 'file' to 'path' to be more accurate
|
||||
* Set default make task to be install
|
||||
* fork docs: change SSH to HTTPS in example
|
||||
* effort: fix active days always 1
|
||||
* Merge pull request #419 from nicolaiskogheim/git-guilt
|
||||
* Merge pull request #420 from nicolaiskogheim/git-summary
|
||||
* line-summary: 'function f{...' -> 'f() {...'
|
||||
* line-summary: add missing quotation marks
|
||||
* line-summary: tighten regex
|
||||
* summary docs: Remove --line example
|
||||
* summary docs: explain relation to git-line-summary
|
||||
* summary docs: use correct order of arguments
|
||||
* guilt: remove --help option
|
||||
* guilt: document call without arguments
|
||||
* guilt docs: Capitalize letters
|
||||
* guilt: Adds simplified example
|
||||
* Merge pull request #418 from nicolaiskogheim/fork-bugfix
|
||||
* fork: http-urls had colon instead of slash
|
||||
* Merge pull request #416 from nicolaiskogheim/fork-docs
|
||||
* Merge pull request #415 from nicolaiskogheim/contrib-docs
|
||||
* fork: original->upstream in docs
|
||||
* contrib: update docs
|
||||
* Merge pull request #414 from nicolaiskogheim/alias-docs
|
||||
* alias: docs
|
||||
* Add completion for git-psykorebase.
|
||||
* Create a bash version of git-psykorebase — Fixes #411
|
||||
* Merge pull request #409 from nicolaiskogheim/refactor-alias
|
||||
* alias: polish the docs
|
||||
* alias: bugfix
|
||||
* Merge pull request #408 from nicolaiskogheim/refactor-contrib
|
||||
* contrib: refactor, and conform to git
|
||||
* Merge pull request #405 from nicolaiskogheim/fix-filenames-with-spaces
|
||||
* Merge pull request #404 from nicolaiskogheim/freebsd-fix
|
||||
* Merge pull request #406 from nicolaiskogheim/portable-msysgit
|
||||
* git-alias: use sed insted of colrm
|
||||
* git-changelog: use cp instead of mv
|
||||
* git-extras: use git-help instead of man
|
||||
* add install script for PortableGit(msysgit)
|
||||
* Quote variables bc of filenames with spaces
|
||||
* Guard against 'seq 0'
|
||||
* Fix error on FreeBSD with process substitution
|
||||
* Pass --import-functions if required
|
||||
* Merge pull request #403 from andreicristianpetcu/master
|
||||
* effort: documentation for git effort --since #326
|
||||
* Merge pull request #401 from nicolaiskogheim/effort-above-error-on-NaN
|
||||
* effort: error on bad value to --above
|
||||
* Merge pull request #400 from nicolaiskogheim/fix-off-by-one
|
||||
* Merge pull request #391 from nicolaiskogheim/effort-limit-commits
|
||||
* Merge pull request #388 from chernjie/release
|
||||
* Merge pull request #398 from nicolaiskogheim/git-graft
|
||||
* Merge pull request #399 from nicolaiskogheim/git-archive-file
|
||||
* archive-file: cleaner way to get current branch
|
||||
* graft: Require destination branch. Fix #23
|
||||
* effort: don't count untouched files
|
||||
* Add info about new options to man pages
|
||||
* Add completion for more options to effort
|
||||
* Do proper argument parsing
|
||||
* effort: allow sending options to log. Fix #326
|
||||
* Merge pull request #396 from tocker/bug/changelog-catch-head
|
||||
* Catch "HEAD -> master" when creating the changelog
|
||||
* Merge pull request #394 from markeissler/changelog-signal-trap
|
||||
* Remove unused var.
|
||||
* Merge pull request #390 from nicolaiskogheim/effort-color-relative-to-above
|
||||
* Handle signals in git-changelog.
|
||||
* Meke coloring respect --above. Fix 74
|
||||
* Merge pull request #392 from nicolaiskogheim/WIP-effort-parallelize
|
||||
* Avoid spawning subshell
|
||||
* Remove unnecessary call to cat
|
||||
* perf: reduce calls to git log
|
||||
* Parallelize git-effort with xargs
|
||||
* Alter options to git log. Remove pipe
|
||||
* cd man && ./manning-up.sh && git diff --stat | grep ' 2 ' | awk '{print }' | xargs git checkout --
|
||||
* Merge pull request #386 from rstacruz/patch-2
|
||||
* Use https for git-fork
|
||||
* Merge pull request #385 from gisphm/master
|
||||
* added windows installation section in the Installation.md
|
||||
* format install.cmd
|
||||
* add install.cmd for installation on windows
|
||||
* Merge pull request #383 from Somasis/master
|
||||
* Makefile: Use a more portable mktemp invocation
|
||||
* Using shorter URL
|
||||
* Merge pull request #381 from spacewander/master
|
||||
* installation with curl and bash
|
||||
* Merge pull request #380 from spacewander/master
|
||||
* keep installation silent
|
||||
* Merge pull request #378 from spacewander/master
|
||||
* update installation in `git-extras update`
|
||||
* Merge pull request #377 from go2null/master
|
||||
* FIXes location of `--` for `grep`
|
||||
* FIXes 'mktemp' to work again on Linux
|
||||
* Merge pull request #373 from zlx/feature/document_line_summary
|
||||
* Document for git-line-summary
|
||||
* Merge pull request #372 from spacewander/patch-1
|
||||
* install the latest release version of git-extras
|
||||
* Merge pull request #370 from phigoro/master
|
||||
* git-effort: replace "wc | cut" with "wc | awk"
|
||||
* Merge pull request #369 from phigoro/master
|
||||
* align hashbang of git-guilt & git-merge-into
|
||||
* Merge pull request #368 from zlx/feature/strong_line_summary
|
||||
* Fix Fatal for git-line-summary
|
||||
* Merge pull request #365 from rkennedy/bug-ignore-regex2
|
||||
* Don't treat ignored patterns as regexps
|
||||
|
||||
3.0.0 / 2015-04-27
|
||||
==================
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,53 @@
|
|||
## Debian
|
||||
# Installing git-extras
|
||||
|
||||
## Installing with a package manager
|
||||
|
||||
### Debian
|
||||
|
||||
```bash
|
||||
$ sudo $apt_pref update
|
||||
$ sudo $apt_pref install git-extras
|
||||
```
|
||||
|
||||
## Mac
|
||||
### Mac OS X with Homebrew
|
||||
|
||||
```bash
|
||||
$ brew install git-extras
|
||||
```
|
||||
|
||||
## Clone / Tarball:
|
||||
### Windows
|
||||
|
||||
First, please install `Git for Windows 2.x` from 'https://github.com/git-for-windows/git/releases'.
|
||||
Second, clone the `git-extras` repo into any folder you like.
|
||||
```bash
|
||||
git clone https://github.com/tj/git-extras.git
|
||||
# checkout the latest tag (optional)
|
||||
git checkout $(git describe --tags $(git rev-list --tags --max-count=1))
|
||||
```
|
||||
|
||||
After that, execute the `install.cmd` in the command prompt. If you installed
|
||||
git as admin, you need to run this prompt as admin, too. Per default, it finds
|
||||
a `Git for Windows 2.x` if it's in the path (first path in `where git.exe` wins)
|
||||
or installed in the default location `%ProgramFiles%\Git`. The fallback is
|
||||
`C:\SCM\PortableGit`. If you didn't install git into one of these dirs, you have
|
||||
to supply the path for the install location, e.g. if git is installed
|
||||
in `c:\git`:
|
||||
|
||||
```batch
|
||||
install.cmd "C:\git"
|
||||
```
|
||||
|
||||
Last, to use `git line-summary`, `git summary` and `git ignore-io`, you need to copy
|
||||
`column.exe` from a [msys2][1] installation from `folder-your-msys2-installed/usr/bin`
|
||||
to `folder-your-git-installed/usr/bin` or wait for git 2.7.1, which will include column.exe.
|
||||
|
||||
### BSD
|
||||
|
||||
Use the instructions to build from source below. Make sure you are using `gmake` (GNU `make`) instead of `make`.
|
||||
|
||||
## Building from source
|
||||
|
||||
Obtain the git-extras source by cloning [its GitHub repo](https://github.com/tj/git-extras.git) or downloading a tarball of a [release](https://github.com/tj/git-extras/releases). Then install it by doing `make install` from the source tree.
|
||||
|
||||
```bash
|
||||
$ git clone https://github.com/tj/git-extras.git
|
||||
|
|
@ -21,33 +57,41 @@ $ git checkout $(git describe --tags $(git rev-list --tags --max-count=1))
|
|||
$ [sudo] make install
|
||||
```
|
||||
|
||||
By default, git-extras is installed under `/usr/local`. To install it at an
|
||||
alternate location, specify a `PREFIX` when calling `make`.
|
||||
|
||||
```bash
|
||||
# Non-root users can install under their home directory
|
||||
make install PREFIX=$HOME/software
|
||||
|
||||
# For third-party software kept under /opt
|
||||
make install PREFIX=/opt
|
||||
```
|
||||
|
||||
If you want to relocate the bulk of the installation but still have configuration
|
||||
files installed to the system `/etc` dir or other alternate location, you can
|
||||
specify `SYSCONFDIR` in addition to `PREFIX`.
|
||||
|
||||
```
|
||||
$ sudo make install PREFIX=/usr/local SYSCONFDIR=/etc
|
||||
```
|
||||
|
||||
See the Makefile for details on advanced configuration options.
|
||||
|
||||
## Installing from network
|
||||
|
||||
One-liner:
|
||||
|
||||
```bash
|
||||
curl -sSL http://git.io/git-extras-setup | sudo bash /dev/stdin
|
||||
```
|
||||
|
||||
## Windows (use it at your own risk)
|
||||
## Updating
|
||||
|
||||
First, please install `Git for Windows 2.x` from 'https://github.com/git-for-windows/git/releases'
|
||||
and the basic [msys2][1].
|
||||
Second, clone the `git-extras` repo into any folder you like.
|
||||
```bash
|
||||
git clone https://github.com/tj/git-extras.git
|
||||
# checkout the latest tag (optional)
|
||||
git checkout $(git describe --tags $(git rev-list --tags --max-count=1))
|
||||
```
|
||||
If you installed git-extras with a package manager, use that package manager's tools to update it.
|
||||
|
||||
After that, execute the `install.cmd` in the command prompt, with the path your `Git for Windows 2.x` is installed.
|
||||
For example, I install it in the folder called `C:\SCM\PortableGit` and
|
||||
the `PREFIX` should be `C:\SCM\PortableGit\mingw64` (for 64-bit release)
|
||||
or `C:\SCM\PortableGit\mingw32` (for 32-bit release). So I will execute the `install.cmd` like this:
|
||||
```batch
|
||||
install.cmd "C:\SCM\PortableGit\mingw64"
|
||||
```
|
||||
If you installed git-extras from source, you can run `git-extras update` to update it to the latest release. Be aware that this may lose any configuration options you specified during the original installation.
|
||||
|
||||
Last, please copy `colrm.exe` and `column.exe` from `folder-your-msys2-installed/usr/bin` to
|
||||
`folder-your-git-installed/usr/bin`.
|
||||
Enjoy `git-extras`!
|
||||
|
||||
[1]: http://sourceforge.net/projects/msys2/
|
||||
[1]: http://sourceforge.net/projects/msys2/
|
||||
|
|
|
|||
2
LICENSE
2
LICENSE
|
|
@ -1,6 +1,6 @@
|
|||
(The MIT License)
|
||||
|
||||
Copyright (c) 2015 TJ Holowaychuk <tj@vision-media.ca>
|
||||
Copyright (c) 2010 TJ Holowaychuk <tj@vision-media.ca> and Contributors
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of this software and associated documentation files (the
|
||||
|
|
|
|||
43
Makefile
43
Makefile
|
|
@ -1,15 +1,15 @@
|
|||
PREFIX ?= /usr/local
|
||||
BINPREFIX ?= "$(PREFIX)/bin"
|
||||
MANPREFIX ?= "$(PREFIX)/share/man/man1"
|
||||
SYSCONFDIR ?= $(PREFIX)/etc
|
||||
BINS = $(wildcard bin/git-*)
|
||||
MANS = $(wildcard man/git-*.md)
|
||||
MAN_HTML = $(MANS:.md=.html)
|
||||
MAN_PAGES = $(MANS:.md=.1)
|
||||
# Libraries used by all commands
|
||||
LIB = "helper/reset-env" "helper/git-extra-utility"
|
||||
|
||||
COMMANDS_USED_WITHOUT_GIT_REPO = git-alias git-extras git-fork git-setup
|
||||
COMMANDS_USED_WITH_GIT_REPO = $(filter-out $(COMMANDS_USED_WITHOUT_GIT_REPO), \
|
||||
$(subst bin/, , $(BINS)))
|
||||
COMMANDS = $(subst bin/, , $(BINS))
|
||||
|
||||
default: install
|
||||
|
||||
|
|
@ -20,20 +20,27 @@ install:
|
|||
@mkdir -p $(DESTDIR)$(BINPREFIX)
|
||||
@echo "... installing bins to $(DESTDIR)$(BINPREFIX)"
|
||||
@echo "... installing man pages to $(DESTDIR)$(MANPREFIX)"
|
||||
$(eval TEMPFILE := $(shell mktemp -q ${TMPDIR:-/tmp}/git-extras.XXXXXX 2>/dev/null || mktemp -q))
|
||||
$(eval TEMPFILE := $(shell mktemp -q $${TMPDIR:-/tmp}/git-extras.XXXXXX 2>/dev/null || mktemp -q))
|
||||
@# chmod from rw-------(default) to rwxrwxr-x, so that users can exec the scripts
|
||||
@chmod 775 $(TEMPFILE)
|
||||
@$(foreach COMMAND, $(COMMANDS_USED_WITH_GIT_REPO), \
|
||||
echo "... installing $(COMMAND)"; \
|
||||
head -1 bin/$(COMMAND) | cat - $(LIB) ./helper/is-git-repo > $(TEMPFILE); \
|
||||
tail -n +2 bin/$(COMMAND) >> $(TEMPFILE); \
|
||||
cp -f $(TEMPFILE) $(DESTDIR)$(BINPREFIX)/$(COMMAND); \
|
||||
)
|
||||
@$(foreach COMMAND, $(COMMANDS_USED_WITHOUT_GIT_REPO), \
|
||||
echo "... installing $(COMMAND)"; \
|
||||
head -1 bin/$(COMMAND) | cat - $(LIB) > $(TEMPFILE); \
|
||||
tail -n +2 bin/$(COMMAND) >> $(TEMPFILE); \
|
||||
cp -f $(TEMPFILE) $(DESTDIR)$(BINPREFIX)/$(COMMAND); \
|
||||
$(eval EXISTED_ALIASES := $(shell \
|
||||
git config --get-regexp 'alias.*' | awk '{print "git-" substr($$1, 7)}'))
|
||||
@$(foreach COMMAND, $(COMMANDS), \
|
||||
disable=''; \
|
||||
if test ! -z "$(filter $(COMMAND), $(EXISTED_ALIASES))"; then \
|
||||
read -p "$(COMMAND) conflicts with an alias, still install it and disable the alias? [y/n]" answer; \
|
||||
test "$$answer" = 'n' -o "$$answer" = 'N' && disable="true"; \
|
||||
fi; \
|
||||
if test -z "$$disable"; then \
|
||||
echo "... installing $(COMMAND)"; \
|
||||
head -1 bin/$(COMMAND) > $(TEMPFILE); \
|
||||
cat $(LIB) >> $(TEMPFILE); \
|
||||
if ! grep "$(COMMAND)" not_need_git_repo >/dev/null; then \
|
||||
cat ./helper/is-git-repo >> $(TEMPFILE); \
|
||||
fi; \
|
||||
tail -n +2 bin/$(COMMAND) >> $(TEMPFILE); \
|
||||
cp -f $(TEMPFILE) $(DESTDIR)$(BINPREFIX)/$(COMMAND); \
|
||||
fi; \
|
||||
)
|
||||
@if [ -z "$(wildcard man/git-*.1)" ]; then \
|
||||
echo "WARNING: man pages not created, use 'make docs' (which requires 'ronn' ruby lib)"; \
|
||||
|
|
@ -41,8 +48,8 @@ install:
|
|||
cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX); \
|
||||
echo "cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX)"; \
|
||||
fi
|
||||
@mkdir -p $(DESTDIR)/etc/bash_completion.d
|
||||
cp -f etc/bash_completion.sh $(DESTDIR)/etc/bash_completion.d/git-extras
|
||||
@mkdir -p $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
|
||||
cp -f etc/bash_completion.sh $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/git-extras
|
||||
|
||||
man/%.html: man/%.md
|
||||
ronn \
|
||||
|
|
@ -66,7 +73,7 @@ uninstall:
|
|||
echo "... uninstalling $(DESTDIR)$(MANPREFIX)/$(notdir $(MAN))"; \
|
||||
rm -f $(DESTDIR)$(MANPREFIX)/$(notdir $(MAN)); \
|
||||
)
|
||||
rm -f $(DESTDIR)/etc/bash_completion.d/git-extras
|
||||
rm -f $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/git-extras
|
||||
|
||||
clean: docclean
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
# Git Extras
|
||||
|
||||
[](https://gitter.im/tj/git-extras)
|
||||
|
||||
Little git extras.
|
||||
|
||||
## Screencasts
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ fi
|
|||
#
|
||||
|
||||
authors() {
|
||||
git shortlog -sne | awk '{$1=""; sub(" ", ""); print}'
|
||||
git shortlog -sne | awk '{$1=""; sub(" ", ""); print}' | awk -F'<' '!x[$1]++' | awk -F'<' '!x[$2]++'
|
||||
}
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -10,6 +10,5 @@ else
|
|||
echo "too many arguments; if not finishing a bug, only <name> of new bug is expected" && exit 1
|
||||
fi
|
||||
branch=bug/$1
|
||||
git checkout -b $branch &> /dev/null
|
||||
test -n $? && git checkout $branch &> /dev/null
|
||||
git checkout -b $branch
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ DEF_TAG_RECENT="n.n.n"
|
|||
GIT_LOG_OPTS="$(git config changelog.opts)"
|
||||
GIT_LOG_FORMAT="$(git config changelog.format)"
|
||||
[[ -z "$GIT_LOG_FORMAT" ]] && GIT_LOG_FORMAT=' * %s'
|
||||
GIT_MERGELOG_FORMAT="$(git config changelog.mergeformat)"
|
||||
[[ -z "$GIT_MERGELOG_FORMAT" ]] && GIT_MERGELOG_FORMAT=' * %s%n%w(64,4,4)%b'
|
||||
GIT_EDITOR="$(git var GIT_EDITOR)"
|
||||
PROGNAME="git-changelog"
|
||||
|
||||
|
|
@ -26,6 +28,7 @@ OPTIONS:
|
|||
-f, --final-tag Newest tag to retrieve commits from in a range
|
||||
-s, --start-tag Oldest tag to retrieve commits from in a range
|
||||
-n, --no-merges Suppress commits from merged branches
|
||||
-m, --merges-only Only uses merge commits (uses both subject and body of commit)
|
||||
-p, --prune-old Replace existing Changelog entirely with new content
|
||||
-x, --stdout Write output to stdout instead of to a Changelog file
|
||||
-h, --help, ? Show this message
|
||||
|
|
@ -143,13 +146,13 @@ _fetchCommitRange() {
|
|||
local final_tag="$3"
|
||||
|
||||
if [[ "$list_all" == true ]]; then
|
||||
git log $GIT_LOG_OPTS --pretty=format:"${GIT_LOG_FORMAT}"
|
||||
git log $GIT_LOG_OPTS --pretty=format:"${CUR_GIT_LOG_FORMAT}"
|
||||
elif [[ -n "$final_tag" && "$start_tag" == "null" ]]; then
|
||||
git log $GIT_LOG_OPTS --pretty=format:"${GIT_LOG_FORMAT}" "${final_tag}"
|
||||
git log $GIT_LOG_OPTS --pretty=format:"${CUR_GIT_LOG_FORMAT}" "${final_tag}"
|
||||
elif [[ -n "$final_tag" ]]; then
|
||||
git log $GIT_LOG_OPTS --pretty=format:"${GIT_LOG_FORMAT}" "${start_tag}"'..'"${final_tag}"
|
||||
git log $GIT_LOG_OPTS --pretty=format:"${CUR_GIT_LOG_FORMAT}" "${start_tag}"'..'"${final_tag}"
|
||||
elif [[ -n "$start_tag" ]]; then
|
||||
git log $GIT_LOG_OPTS --pretty=format:"${GIT_LOG_FORMAT}" "${start_tag}"'..'
|
||||
git log $GIT_LOG_OPTS --pretty=format:"${CUR_GIT_LOG_FORMAT}" "${start_tag}"'..'
|
||||
fi | sed 's/^ \* \*/ */g'
|
||||
}
|
||||
|
||||
|
|
@ -314,7 +317,20 @@ _exit() {
|
|||
stty sane; echo; echo "caught signal, shutting down"
|
||||
|
||||
IFS=$'\n'
|
||||
pid_list=( $(pgrep -P $$) )
|
||||
# The format of `ps` is different between Windows and other platforms,
|
||||
# so we need to calculate the total column number(COL_NUM) of header first.
|
||||
# Why don't we just use the last column?
|
||||
# Because the body of CMD column may contain space and be treated as multiple fileds.
|
||||
pid_list=( $(ps -f |
|
||||
awk -v ppid=$$ 'NR == 1 {
|
||||
COL_NUM = NF
|
||||
}
|
||||
$3 == ppid {
|
||||
# filter out temp processes created in this subshell
|
||||
if ($COL_NUM != "ps" && $COL_NUM != "awk" && $COL_NUM !~ "bash$")
|
||||
print $2
|
||||
}')
|
||||
)
|
||||
IFS="$defaultIFS"
|
||||
|
||||
local _pid
|
||||
|
|
@ -375,6 +391,11 @@ main() {
|
|||
;;
|
||||
-n | --no-merges )
|
||||
GIT_LOG_OPTS='--no-merges'
|
||||
CUR_GIT_LOG_FORMAT="$GIT_LOG_FORMAT"
|
||||
;;
|
||||
-m | --merges-only )
|
||||
GIT_LOG_OPTS='--merges'
|
||||
CUR_GIT_LOG_FORMAT="$GIT_MERGELOG_FORMAT"
|
||||
;;
|
||||
-p | --prune-old )
|
||||
option=( $(_setValueForKeyFakeAssocArray "prune_old" true "${option[*]}") )
|
||||
|
|
@ -393,7 +414,10 @@ main() {
|
|||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
|
||||
# The default log format unless already set
|
||||
[[ -z "$CUR_GIT_LOG_FORMAT" ]] && CUR_GIT_LOG_FORMAT="$GIT_LOG_FORMAT"
|
||||
|
||||
local _tag="$(_valueForKeyFakeAssocArray "start_tag" "${option[*]}")"
|
||||
if [[ -n "${_tag}" ]]; then
|
||||
start_tag="$(git describe --tags --abbrev=0 "${_tag}" 2>/dev/null)"
|
||||
|
|
@ -454,7 +478,10 @@ main() {
|
|||
rm -f "$tmpfile"
|
||||
else
|
||||
cp -f "$tmpfile" "$changelog"
|
||||
[[ -n "$GIT_EDITOR" ]] && $GIT_EDITOR "$changelog"
|
||||
# Use `eval` to handle GIT_EDITOR which contains space and options,
|
||||
# like ""C:\Program Files (x86)\Notepad++\notepad++.exe" -multiInst ".
|
||||
# Thanks @JanSchulz to inspire me this solution
|
||||
[[ -n "$GIT_EDITOR" ]] && eval $GIT_EDITOR "$changelog"
|
||||
if [[ $? -ne 0 ]]; then
|
||||
_exit
|
||||
fi
|
||||
|
|
|
|||
3
bin/git-chore
Normal file → Executable file
3
bin/git-chore
Normal file → Executable file
|
|
@ -10,6 +10,5 @@ else
|
|||
echo "too many arguments; if not finishing a chore, only <name> of new chore is expected" && exit 1
|
||||
fi
|
||||
branch=chore/$1
|
||||
git checkout -b $branch &> /dev/null
|
||||
test -n $? && git checkout $branch &> /dev/null
|
||||
git checkout -b $branch
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
echo "Sure? - This command may delete files that cannot be recovered. [Y/n]"
|
||||
read ans
|
||||
if [ "$ans" != "n" ]
|
||||
|
|
|
|||
137
bin/git-effort
137
bin/git-effort
|
|
@ -2,13 +2,28 @@
|
|||
|
||||
tmp=$(git_extra_mktemp)
|
||||
above=0
|
||||
# if the output won't be printed to tty, disable the color
|
||||
test -t 1 && to_tty=true
|
||||
color=
|
||||
|
||||
#
|
||||
# print usage message
|
||||
#
|
||||
usage() {
|
||||
echo 1>&2 "usage: git effort [--above <value>] [<path>...] [-- [<log options>...]]"
|
||||
}
|
||||
|
||||
#
|
||||
# get dates for the given <commit>
|
||||
#
|
||||
dates() {
|
||||
eval "git log --pretty='format: %ad' --date=short $args_to_git_log \"$1\""
|
||||
eval "git log $args_to_git_log --pretty='format: %ad' --date=short \"$1\""
|
||||
}
|
||||
|
||||
# tput, being quiet about unknown capabilities
|
||||
tputq() {
|
||||
tput "$@" 2>/dev/null
|
||||
return 0
|
||||
}
|
||||
|
||||
#
|
||||
|
|
@ -16,7 +31,7 @@ dates() {
|
|||
#
|
||||
|
||||
hide_cursor() {
|
||||
printf '\033[?25l'
|
||||
tputq civis
|
||||
}
|
||||
|
||||
#
|
||||
|
|
@ -24,8 +39,8 @@ hide_cursor() {
|
|||
#
|
||||
|
||||
show_cursor_and_cleanup() {
|
||||
printf '\033[?25h'
|
||||
printf '\033[m\n'
|
||||
tputq cvvis
|
||||
tputq sgr0
|
||||
rm "$tmp" > /dev/null 2>&1
|
||||
exit 0
|
||||
}
|
||||
|
|
@ -35,7 +50,7 @@ show_cursor_and_cleanup() {
|
|||
#
|
||||
|
||||
active_days() {
|
||||
echo "$1" | uniq | wc -l
|
||||
echo "$1" | sort -r | uniq | wc -l
|
||||
}
|
||||
|
||||
#
|
||||
|
|
@ -43,14 +58,20 @@ active_days() {
|
|||
#
|
||||
|
||||
color_for() {
|
||||
test $1 -gt 10 && color='33'
|
||||
test $1 -gt 25 && color='33;1'
|
||||
test $1 -gt 50 && color='93'
|
||||
test $1 -gt 75 && color='93;1'
|
||||
test $1 -gt 100 && color='31'
|
||||
test $1 -gt 125 && color='31;1'
|
||||
test $1 -gt 150 && color='91'
|
||||
test $1 -gt 200 && color='91;1'
|
||||
if [ "$to_tty" = true ]; then
|
||||
if [ $1 -gt 200 ]; then color="$(tputq setaf 1)$(tputq bold)"
|
||||
elif [ $1 -gt 150 ]; then color="$(tputq setaf 1)" # red
|
||||
elif [ $1 -gt 125 ]; then color="$(tputq setaf 2)$(tputq bold)"
|
||||
elif [ $1 -gt 100 ]; then color="$(tputq setaf 2)" # green
|
||||
elif [ $1 -gt 75 ]; then color="$(tputq setaf 5)$(tputq bold)"
|
||||
elif [ $1 -gt 50 ]; then color="$(tputq setaf 5)" # purplish
|
||||
elif [ $1 -gt 25 ]; then color="$(tputq setaf 3)$(tputq bold)"
|
||||
elif [ $1 -gt 10 ]; then color="$(tputq setaf 3)" # yellow
|
||||
else color="$(tputq sgr0)" # default color
|
||||
fi
|
||||
else
|
||||
color=""
|
||||
fi
|
||||
}
|
||||
|
||||
#
|
||||
|
|
@ -60,6 +81,9 @@ color_for() {
|
|||
effort() {
|
||||
path=$1
|
||||
local commit_dates
|
||||
local color reset_color commits len dot f_dot i msg active
|
||||
reset_color=""
|
||||
test "$to_tty" = true && reset_color="$(tputq sgr0)"
|
||||
commit_dates=`dates "$path"`
|
||||
[ $? -gt 0 ] && exit 255
|
||||
|
||||
|
|
@ -85,12 +109,12 @@ effort() {
|
|||
i=$(($i+1))
|
||||
done
|
||||
|
||||
msg=$(printf " \033[${color}m%s %-10d" "$f_dot" $commits)
|
||||
msg=$(printf " ${color}%s %-10d" "$f_dot" $commits)
|
||||
|
||||
# active days
|
||||
active=`active_days "$commit_dates"`
|
||||
color_for $(( $active - $above ))
|
||||
msg="$msg $(printf "\033[${color}m %d\033[0m\n" $active)"
|
||||
msg="$msg $(printf "${color} %d${reset_color}\n" $active)"
|
||||
echo "$msg"
|
||||
}
|
||||
|
||||
|
|
@ -110,46 +134,38 @@ heading() {
|
|||
|
||||
sort_effort() {
|
||||
clear
|
||||
echo
|
||||
echo " "
|
||||
heading
|
||||
< $tmp sort -rn -k 2
|
||||
}
|
||||
|
||||
above_index=0
|
||||
has_above=false
|
||||
next_is_above=false
|
||||
num_paths=0
|
||||
declare -a paths=()
|
||||
while [ "${#}" -ge 1 ] ; do
|
||||
|
||||
# Some implementations of `seq` gives "1\n0" for seq 0
|
||||
if [ $# -gt 0 ] ; then
|
||||
for i in `seq ${#@}`
|
||||
do
|
||||
cur="${!i}"
|
||||
case "$1" in
|
||||
--above)
|
||||
shift
|
||||
above=$1
|
||||
;;
|
||||
--)
|
||||
shift
|
||||
args_to_git_log=$(printf " %q" "${@:1}")
|
||||
break
|
||||
;;
|
||||
--*)
|
||||
usage
|
||||
echo 1>&2 "error: unknown argument $1"
|
||||
echo 1>&2 "error: if that argument was meant for git-log,"
|
||||
echo 1>&2 "error: please put it after two dashes ( -- )."
|
||||
exit 1
|
||||
;;
|
||||
*)
|
||||
paths+=( "$1" )
|
||||
;;
|
||||
esac
|
||||
|
||||
if "$next_is_above" ; then
|
||||
above="$cur"
|
||||
next_is_above=false
|
||||
continue
|
||||
fi
|
||||
|
||||
case "$cur" in
|
||||
--above)
|
||||
if "$has_above" ; then
|
||||
echo "error: --above can only be specified one time" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
next_is_above=true
|
||||
has_above=true
|
||||
above_index=$(( i - 1 ))
|
||||
;;
|
||||
--*)
|
||||
;;
|
||||
*)
|
||||
num_paths=$(( num_paths + 1 ))
|
||||
;;
|
||||
esac
|
||||
done
|
||||
fi
|
||||
shift
|
||||
done
|
||||
|
||||
# Exit if above-value is not an int
|
||||
if [ -z "${above##*[!0-9]*}" ] ; then
|
||||
|
|
@ -157,30 +173,17 @@ if [ -z "${above##*[!0-9]*}" ] ; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
args_before_above=`printf " %q" "${@:1:$above_index}"`
|
||||
|
||||
num_args=$(( i - num_paths ))
|
||||
if $has_above ; then offset=2 ; else offset=0 ; fi
|
||||
from=$(( 1 + above_index + offset ))
|
||||
len=$(( num_args - $(( above_index + offset)) ))
|
||||
args_after_above=`printf " %q" "${@:$from:$len}"`
|
||||
|
||||
args_to_git_log="${args_before_above#\ \'\'}${args_after_above#\ \'\'}"
|
||||
|
||||
shift $num_args
|
||||
|
||||
# remove empty quotes that appear when there are no arguments
|
||||
args_to_git_log="${args_to_git_log#\ \'\'}"
|
||||
export args_to_git_log
|
||||
|
||||
# [path ...]
|
||||
|
||||
declare -a paths=()
|
||||
if test $# -ge 1; then
|
||||
paths=("$@")
|
||||
else
|
||||
if test "${#paths}" -eq 0; then
|
||||
save_ifs=$IFS
|
||||
IFS=`echo -en "\n\b"`
|
||||
paths=(`git ls-files`)
|
||||
IFS=$safe_ifs
|
||||
IFS=$save_ifs
|
||||
unset save_ifs
|
||||
fi
|
||||
|
||||
|
|
@ -194,6 +197,8 @@ export -f effort
|
|||
export -f color_for
|
||||
export -f active_days
|
||||
export -f dates
|
||||
export -f tputq
|
||||
export to_tty
|
||||
export above
|
||||
export log_args
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
VERSION="3.0.0"
|
||||
VERSION="4.2.0-dev"
|
||||
INSTALL_SCRIPT="https://raw.githubusercontent.com/tj/git-extras/master/install.sh"
|
||||
|
||||
update() {
|
||||
|
|
|
|||
|
|
@ -1,25 +1,41 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
branch_prefix=feature
|
||||
declare -a argv
|
||||
while test $# != 0
|
||||
do
|
||||
case $1 in
|
||||
-a|--alias )
|
||||
if [[ -n $2 ]]
|
||||
then
|
||||
shift # shift -a|-alias
|
||||
branch_prefix=$1
|
||||
else
|
||||
argv+=($1) # treat tail '-a' as <name>
|
||||
fi
|
||||
;;
|
||||
* )
|
||||
argv+=($1)
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
concatargs(){
|
||||
delim='-'
|
||||
str=
|
||||
for i in "$@"; do
|
||||
str="$str$delim$i"
|
||||
done
|
||||
branch=feature/${str:1}
|
||||
str=$(IFS='-'; echo "$*")
|
||||
branch="$branch_prefix"/$str
|
||||
}
|
||||
|
||||
if test "$1" = "finish"; then
|
||||
test -z $2 && echo "feature <name> required." 1>&2 && exit 1
|
||||
branch=feature/$2
|
||||
git merge --no-ff $branch && git delete-branch $branch
|
||||
if test "${argv[0]}" = "finish"; then
|
||||
test -z "${argv[1]}" && echo "$branch_prefix" "<name> required." 1>&2 && exit 1
|
||||
branch="$branch_prefix"/"${argv[1]}"
|
||||
git merge --no-ff "$branch" && git delete-branch "$branch"
|
||||
else
|
||||
test -z $1 && echo "feature <name> required." 1>&2 && exit 1
|
||||
if test -n "$2"; then
|
||||
concatargs ${@:2}
|
||||
test -z "${argv[0]}" && echo "$branch_prefix" "<name> required." 1>&2 && exit 1
|
||||
if test -n "${argv[1]}"; then
|
||||
concatargs "${argv[@]}"
|
||||
else
|
||||
branch=feature/$1
|
||||
branch="$branch_prefix"/"${argv[0]}"
|
||||
fi
|
||||
git checkout -b $branch &> /dev/null
|
||||
test -n $? && git checkout $branch &> /dev/null
|
||||
git checkout -b $branch
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -14,7 +14,15 @@ function show_global {
|
|||
}
|
||||
|
||||
function add_global {
|
||||
add_patterns `git config --global core.excludesfile` "$@"
|
||||
local global_gitignore=$(git config --global core.excludesfile)
|
||||
if [ -z "$global_gitignore" ]; then
|
||||
echo "Can't find global .gitignore."
|
||||
echo ""
|
||||
echo "Use 'git config --global --add core.excludesfile ~/.gitignore-global' to set the path to your global gitignore file to '~/.gitignore-global'."
|
||||
echo ""
|
||||
else
|
||||
add_patterns `git config --global core.excludesfile` "$@"
|
||||
fi
|
||||
}
|
||||
|
||||
function show_local {
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ single_file() {
|
|||
while read data
|
||||
do
|
||||
if [[ $(file "$data") = *text* ]]; then
|
||||
git blame --line-porcelain "$data" 2>/dev/null | grep "^author\ " | sed -n 's/^author //p';
|
||||
git blame --line-porcelain "$data" 2>/dev/null | grep "^author\ " | LC_ALL=C sed -n 's/^author //p';
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
|
|
|||
12
bin/git-pr
12
bin/git-pr
|
|
@ -1,11 +1,19 @@
|
|||
#!/usr/bin/env bash
|
||||
# Based on https://gist.github.com/gnarf/5406589
|
||||
# Based on https://gist.github.com/gnarf/5406589 and https://gist.github.com/jhnns/d654d9d6da6d3b749986
|
||||
|
||||
if test "$1" = "clean"; then
|
||||
git for-each-ref refs/heads/pr/* --format='%(refname)' | while read ref; do
|
||||
git branch -D ${ref#refs/heads/}
|
||||
done
|
||||
exit 0
|
||||
elif [[ $1 =~ ^(https?://[^/]+/(.+))/pull/([0-9]+).*$ ]]; then
|
||||
remote=${BASH_REMATCH[1]}.git
|
||||
id=${BASH_REMATCH[3]}
|
||||
branch=pr/$id
|
||||
else
|
||||
test -z $1 && echo "pr number required." 1>&2 && exit 1
|
||||
git fetch -fu ${2:-origin} refs/pull/$1/head:pr/$1 && git checkout pr/$1
|
||||
remote=${2:-origin}
|
||||
id=$1
|
||||
branch=pr/$id
|
||||
fi
|
||||
git fetch -fu $remote refs/pull/$id/head:$branch && git checkout $branch
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
#!/usr/bin/env bash
|
||||
# Removed unnecessary git checkout for bug, feature and refactor
|
||||
|
||||
if test "$1" = "finish"; then
|
||||
test -z $2 && echo "refactor <name> required." 1>&2 && exit 1
|
||||
|
|
@ -11,6 +10,5 @@ else
|
|||
echo "too many arguments; if not finishing a refactor, only <name> of new refactoring is expected" && exit 1
|
||||
fi
|
||||
branch=refactor/$1
|
||||
git checkout -b $branch &> /dev/null
|
||||
test -n $? && git checkout $branch &> /dev/null
|
||||
git checkout -b $branch
|
||||
fi
|
||||
|
|
|
|||
12
bin/git-scp
12
bin/git-scp
|
|
@ -1,10 +1,10 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
COLOR_RED() { echo -en "\033[31m"; }
|
||||
COLOR_GREEN() { echo -en "\033[32m"; }
|
||||
COLOR_YELLOW(){ echo -en "\033[33m"; }
|
||||
COLOR_BLUE() { echo -en "\033[34m"; }
|
||||
COLOR_RESET() { echo -en "\033[0m"; }
|
||||
COLOR_RED() { test -t 1 && echo -n "$(tput setaf 1)"; }
|
||||
COLOR_GREEN() { test -t 1 && echo -n "$(tput setaf 2)"; }
|
||||
COLOR_YELLOW(){ test -t 1 && echo -n "$(tput setaf 3)"; }
|
||||
COLOR_BLUE() { test -t 1 && echo -n "$(tput setaf 4)"; }
|
||||
COLOR_RESET() { test -t 1 && echo -n "$(tput sgr 0)"; }
|
||||
|
||||
function _test_git_scp()
|
||||
{
|
||||
|
|
@ -170,7 +170,7 @@ function _error()
|
|||
case $(basename $0) in
|
||||
git-scp)
|
||||
case $1 in
|
||||
''|-h|?|help|--help) shift; _test_git_scp; _usage $@;;
|
||||
''|-h|'?'|help|--help) shift; _test_git_scp; _usage $@;;
|
||||
*) scp_and_stage $@;;
|
||||
esac
|
||||
;;
|
||||
|
|
|
|||
69
bin/git-sed
Executable file
69
bin/git-sed
Executable file
|
|
@ -0,0 +1,69 @@
|
|||
#!/bin/sh
|
||||
|
||||
usage() {
|
||||
cat <<EOF
|
||||
usage: git sed [ -c ] [ -f <flags> ] <search> <replacement>
|
||||
|
||||
Run git grep and then send results to sed for replacement with the
|
||||
given flags, if -f is provided.
|
||||
|
||||
Also runs git commit if -c is provided.
|
||||
EOF
|
||||
}
|
||||
|
||||
# don't commit by default
|
||||
do_commit() {
|
||||
true
|
||||
}
|
||||
|
||||
while [ "X$1" != "X" ]; do
|
||||
case "$1" in
|
||||
-c|--commit)
|
||||
if git status --porcelain | grep .; then
|
||||
echo "you need to commit your changes before running with --commit"
|
||||
exit 1
|
||||
fi
|
||||
do_commit() {
|
||||
git commit -m"replace $search with $replacement
|
||||
|
||||
actual command:
|
||||
|
||||
$command" -a
|
||||
}
|
||||
;;
|
||||
-f|--flags)
|
||||
if [ "X$2" = "X" ]; then
|
||||
usage
|
||||
echo "missing argument for $1"
|
||||
exit 1
|
||||
fi
|
||||
shift
|
||||
flags=$1
|
||||
;;
|
||||
-h|--help)
|
||||
usage
|
||||
exit
|
||||
;;
|
||||
-*)
|
||||
usage
|
||||
echo "unkonwn flag: $1"
|
||||
exit 1
|
||||
;;
|
||||
*)
|
||||
if [ "X$search" = "X" ]; then
|
||||
search="$1"
|
||||
elif [ "X$replacement" = "X" ]; then
|
||||
replacement="$1"
|
||||
else
|
||||
usage
|
||||
echo "too many arguments: $1"
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
command="git grep -l '$search' | xargs sed -i 's/$search/$replacement/$flags'"
|
||||
git grep -l "$search" | xargs sed -i "s/$search/$replacement/$flags"
|
||||
do_commit
|
||||
0
bin/git-show-merged-branches
Normal file → Executable file
0
bin/git-show-merged-branches
Normal file → Executable file
0
bin/git-show-unmerged-branches
Normal file → Executable file
0
bin/git-show-unmerged-branches
Normal file → Executable file
|
|
@ -1,5 +1,6 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
|
||||
SUBDIRECTORY_OK=Yes
|
||||
source "$(git --exec-path)/git-sh-setup"
|
||||
cd_to_toplevel
|
||||
|
|
@ -21,7 +22,7 @@ date() {
|
|||
#
|
||||
|
||||
active_days() {
|
||||
date $1 | uniq | awk '
|
||||
date $1 | sort -r | uniq | awk '
|
||||
{ sum += 1 }
|
||||
END { print sum }
|
||||
'
|
||||
|
|
@ -48,7 +49,7 @@ file_count() {
|
|||
#
|
||||
|
||||
authors() {
|
||||
git shortlog -n -s $commit | awk '
|
||||
git shortlog -n -s $commit | LC_ALL=C awk '
|
||||
{ args[NR] = $0; sum += $0 }
|
||||
END {
|
||||
for (i = 1; i <= NR; ++i) {
|
||||
|
|
@ -63,13 +64,14 @@ authors() {
|
|||
#
|
||||
|
||||
repository_age() {
|
||||
git log --reverse --pretty=oneline --format="%ar" | head -n 1 | sed 's/ago//'
|
||||
git log --reverse --pretty=oneline --format="%ar" | head -n 1 | LC_ALL=C sed 's/ago//'
|
||||
}
|
||||
|
||||
# summary
|
||||
|
||||
if test "$1" = "--line"; then
|
||||
git line-summary
|
||||
shift
|
||||
git line-summary "$@"
|
||||
echo
|
||||
else
|
||||
|
||||
|
|
|
|||
77
bin/git-sync
Executable file
77
bin/git-sync
Executable file
|
|
@ -0,0 +1,77 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
function _usage()
|
||||
{
|
||||
local command="git sync"
|
||||
cat << EOS
|
||||
Usage:
|
||||
${command} [<remote> <branch>]
|
||||
${command} -h | --help
|
||||
|
||||
Sync local branch with <remote>/<branch>.
|
||||
When <remote> and <branch> are not specified on the command line, upstream of local branch will be used by default.
|
||||
All changes and untracked files and directories will be removed.
|
||||
|
||||
Examples:
|
||||
Sync with upstream of local branch:
|
||||
${command}
|
||||
|
||||
Sync with origin/master:
|
||||
${command} origin master
|
||||
EOS
|
||||
}
|
||||
|
||||
function main()
|
||||
{
|
||||
while [ "$1" != "" ]; do
|
||||
case $1 in
|
||||
-h | --help)
|
||||
_usage
|
||||
exit
|
||||
;;
|
||||
* )
|
||||
if [ "${remote}" = "" ]; then
|
||||
local remote="$1"
|
||||
elif [ "${branch}" = "" ]; then
|
||||
local branch="$1"
|
||||
else
|
||||
echo -e "Error: too many arguments.\n"
|
||||
_usage
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
local remote_branch
|
||||
if [ "${remote}" = "" ]; then
|
||||
if ! remote_branch="$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null)"; then
|
||||
echo "There is no upstream information of local branch."
|
||||
exit 1
|
||||
fi
|
||||
local branch="$(git rev-parse --abbrev-ref --symbolic-full-name @)"
|
||||
local remote=$(git config "branch.${branch}.remote")
|
||||
elif [ "${branch}" = "" ]; then
|
||||
echo -e "Error: too few arguments.\n"
|
||||
_usage
|
||||
exit 1
|
||||
else
|
||||
remote_branch="${remote}/${branch}"
|
||||
fi
|
||||
|
||||
echo "Are you sure you want to clean all changes & sync with '${remote_branch}'? [y/N]"
|
||||
local res
|
||||
read res
|
||||
case "${res}" in
|
||||
"Y" | "y" | "yes" | "Yes" | "YES" )
|
||||
git fetch "${remote}" "${branch}" && git reset --hard "${remote_branch}" && git clean -d -f -x
|
||||
;;
|
||||
* )
|
||||
echo "Canceled."
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
main "$@"
|
||||
|
||||
|
|
@ -1,8 +1,13 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
filename="$*"
|
||||
USAGE(){
|
||||
echo "git touch <filename> [ <filename> . . .]" 1>&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
test -z "$filename" && echo "filename required" 1>&2 && exit 1
|
||||
test $# -lt 1 && USAGE
|
||||
|
||||
touch "$filename" \
|
||||
&& git add "$filename"
|
||||
for filename in $@; do
|
||||
touch "$filename" \
|
||||
&& git add "$filename"
|
||||
done
|
||||
|
|
|
|||
151
install.cmd
151
install.cmd
|
|
@ -1,28 +1,151 @@
|
|||
@ECHO OFF
|
||||
:: don't leak env variables into the calling interperter...
|
||||
setlocal
|
||||
:: better defaults for dealing with quotes...
|
||||
:: You need to escape ! afterwards with ^^! or "^!"
|
||||
SETLOCAL enabledelayedexpansion
|
||||
|
||||
:: A comment on quotes around file path variables:
|
||||
:: only add quotes around the variable when you use the variable
|
||||
:: as a file path (exists, type, pipe,...) and the parenthesis of a
|
||||
:: for, not when used as a string (-> setting variables)
|
||||
|
||||
:: more does not work if the codepage is set to unicode 65001
|
||||
for /F "tokens=*" %%F in ('chcp') do (
|
||||
for %%A in (%%F) do (set _last=%%A)
|
||||
)
|
||||
SET CP=%_last:~0,-1%
|
||||
chcp 850 > NUL
|
||||
:: echo %CP%
|
||||
|
||||
:: not so sane default...
|
||||
SET PREFIX=C:\SCM\PortableGit\mingw64
|
||||
IF NOT "%~1"=="" SET PREFIX="%~1"
|
||||
|
||||
:: find a git.exe in path and use that as a default dir
|
||||
where /Q git.exe
|
||||
if errorlevel 1 goto :defaultpath
|
||||
|
||||
for /F "delims=" %%F in ('where git.exe') do (
|
||||
set bindir=%%~dpF
|
||||
rem break after the first, so that we get the first in path
|
||||
goto :break
|
||||
)
|
||||
goto :defaultpath
|
||||
|
||||
:break
|
||||
rem remove the last slash
|
||||
SET bindir=%bindir:~0,-1%
|
||||
for %%G in ("%bindir%") do set installdir=%%~dpG
|
||||
set PREFIX=%installdir%mingw64
|
||||
goto :foundprefix
|
||||
|
||||
:defaultpath
|
||||
:: default for Git for Windows 2.x
|
||||
if exist "%ProgramFiles%\Git" (
|
||||
set PREFIX=%ProgramFiles%\Git\mingw64
|
||||
)
|
||||
|
||||
:foundprefix
|
||||
:: overwrite with whatever the user supplied...
|
||||
IF NOT "%~1"=="" (
|
||||
REM make it easier for the user to specify a prefix:
|
||||
REM just supplying the git dir is enough...
|
||||
if exist "%~1\mingw64" (
|
||||
set PREFIX=%~1\mingw64
|
||||
) else (
|
||||
echo Using git install path "%~1" as PREFIX, please make sure it's really a
|
||||
echo path to the mingw64 directory...
|
||||
echo.
|
||||
SET PREFIX=%~1
|
||||
)
|
||||
)
|
||||
:: remove a trailing slash, but only after removing quotes...
|
||||
set PREFIX=!PREFIX:"=!
|
||||
IF %PREFIX:~-1%==\ SET PREFIX=%PREFIX:~0,-1%
|
||||
|
||||
for %%H in ("%PREFIX%") do set GIT_INSTALL_DIR=%%~dpH
|
||||
|
||||
set GIT_INSTALL_DIR=!GIT_INSTALL_DIR:"=!
|
||||
IF %GIT_INSTALL_DIR:~-1%==\ SET GIT_INSTALL_DIR=%GIT_INSTALL_DIR:~0,-1%
|
||||
|
||||
if not exist "%GIT_INSTALL_DIR%\mingw64" (
|
||||
echo No mingw64 folder found in %GIT_INSTALL_DIR%.
|
||||
echo.
|
||||
echo Please supply a proper "Git for Windows 2.x" install path:
|
||||
echo "install.cmd c:\[git-install-path]"
|
||||
set ERROR=1
|
||||
goto :exit
|
||||
)
|
||||
|
||||
echo Installing to %PREFIX%
|
||||
SET HTMLDIR=%PREFIX%\share\doc\git-doc
|
||||
SET GITEXTRAS=%~dp0
|
||||
|
||||
IF NOT EXIST %PREFIX%\bin MKDIR %PREFIX%\bin
|
||||
IF NOT EXIST "%PREFIX%\bin" MKDIR "%PREFIX%\bin"
|
||||
|
||||
:: Check that we can install into that dir or need admin rights...
|
||||
set _testfile=%PREFIX%\bin\testfile_to_check_if_dir_is_writeable-577423947123.~
|
||||
copy NUL "%_testfile%" >NUL 2>&1
|
||||
IF EXIST "%_testfile%" (
|
||||
set IS_WRITEABLE=yes
|
||||
del "%_testfile%"
|
||||
) else (
|
||||
set IS_WRITEABLE=no
|
||||
)
|
||||
if "%IS_WRITEABLE%"=="no" (
|
||||
echo.
|
||||
echo Directory for binaries ["%PREFIX%\bin"] is not writeable by install.cmd.
|
||||
echo.
|
||||
echo You probably need to run install.cmd from an admin prompt.
|
||||
set ERROR=1
|
||||
goto :exit
|
||||
)
|
||||
|
||||
SET COMMANDS_WITHOUT_REPO=git-alias git-extras git-fork git-setup
|
||||
|
||||
FOR /R %GITEXTRAS%\bin %%i in (*.*) DO (
|
||||
ECHO #!/usr/bin/env bash > %PREFIX%\bin\%%~ni
|
||||
TYPE %GITEXTRAS%\helper\reset-env >> %PREFIX%\bin\%%~ni
|
||||
TYPE %GITEXTRAS%\helper\git-extra-utility >> %PREFIX%\bin\%%~ni
|
||||
TYPE %GITEXTRAS%\helper\is-git-repo >> %PREFIX%\bin\%%~ni
|
||||
MORE +2 %GITEXTRAS%\bin\%%~ni >> %PREFIX%\bin\%%~ni
|
||||
echo Installing binaries...
|
||||
FOR /R "%GITEXTRAS%\bin" %%i in (*.*) DO (
|
||||
ECHO #^^!/usr/bin/env bash > "%PREFIX%\bin\%%~ni"
|
||||
TYPE "%GITEXTRAS%\helper\reset-env" >> "%PREFIX%\bin\%%~ni"
|
||||
TYPE "%GITEXTRAS%\helper\git-extra-utility" >> "%PREFIX%\bin\%%~ni"
|
||||
TYPE "%GITEXTRAS%\helper\is-git-repo" >> "%PREFIX%\bin\%%~ni"
|
||||
MORE +2 "%GITEXTRAS%\bin\%%~ni" >> "%PREFIX%\bin\%%~ni"
|
||||
)
|
||||
|
||||
FOR %%i in (%COMMANDS_WITHOUT_REPO%) DO (
|
||||
ECHO #!/usr/bin/env bash > %PREFIX%\bin\%%i
|
||||
TYPE %GITEXTRAS%\helper\reset-env >> %PREFIX%\bin\%%i
|
||||
TYPE %GITEXTRAS%\helper\git-extra-utility >> %PREFIX%\bin\%%i
|
||||
MORE +2 %GITEXTRAS%\bin\%%i >> %PREFIX%\bin\%%i
|
||||
ECHO #^^!/usr/bin/env bash > "%PREFIX%\bin\%%i"
|
||||
TYPE "%GITEXTRAS%\helper\reset-env" >> "%PREFIX%\bin\%%i"
|
||||
TYPE "%GITEXTRAS%\helper\git-extra-utility" >> "%PREFIX%\bin\%%i"
|
||||
MORE +2 "%GITEXTRAS%\bin\%%i" >> "%PREFIX%\bin\%%i"
|
||||
)
|
||||
|
||||
ROBOCOPY /IS %GITEXTRAS%\man %HTMLDIR% *.html
|
||||
echo Installing man pages...
|
||||
set _QUIET=/NP /NFL /NDL /NJS /NJH
|
||||
ROBOCOPY %_QUIET% /IS "%GITEXTRAS%\man" "%HTMLDIR%" *.html
|
||||
IF %ERRORLEVEL% GTR 7 (
|
||||
echo Not all html docs could be copied to "%GITEXTRAS%\man".
|
||||
echo.
|
||||
echo You probably need to run the install.cmd script from an admin prompt.
|
||||
set ERROR=1
|
||||
goto :exit
|
||||
)
|
||||
echo done
|
||||
|
||||
@ECHO ON
|
||||
if not exist "%GIT_INSTALL_DIR%\usr\bin\column.exe" (
|
||||
where /Q column.exe
|
||||
if errorlevel 1 (
|
||||
echo.
|
||||
echo column.exe is missing: Not in "%GIT_INSTALL_DIR%\usr\bin" or in PATH!
|
||||
echo.
|
||||
echo "git summary", "git summary-line" and "git ignore-io" do not work without.
|
||||
echo If you need these commands, please install Git for Windows > 2.7.0.
|
||||
echo.
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
:exit
|
||||
@chcp %CP% > NUL
|
||||
@endlocal enabledelayedexpansion
|
||||
@endlocal
|
||||
@exit /b %ERROR%
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-ALIAS" "1" "August 2015" "" ""
|
||||
.TH "GIT\-ALIAS" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-alias\fR \- Define, search and show aliases
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@
|
|||
|
||||
<ol class='man-decor man-head man head'>
|
||||
<li class='tl'>git-alias(1)</li>
|
||||
<li class='tc'>Git Extras</li>
|
||||
<li class='tc'></li>
|
||||
<li class='tr'>git-alias(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
@ -77,7 +77,7 @@
|
|||
<h2 id="SYNOPSIS">SYNOPSIS</h2>
|
||||
|
||||
<p><code>git-alias</code><br />
|
||||
<code>git-alias</code> <search-term><br />
|
||||
<code>git-alias</code> <search-pattern><br />
|
||||
<code>git-alias</code> <alias-name> <command></p>
|
||||
|
||||
<h2 id="DESCRIPTION">DESCRIPTION</h2>
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
|
||||
<h2 id="OPTIONS">OPTIONS</h2>
|
||||
|
||||
<p> <search-term></p>
|
||||
<p> <search-pattern></p>
|
||||
|
||||
<p> The pattern used to search aliases.</p>
|
||||
|
||||
|
|
@ -123,7 +123,7 @@ whois = !sh -c 'git log -i -1 --pretty="format:%an <%ae>
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Jonhnny Weslley <<a href="mailto:jw@jonhnnyweslley.net" data-bare-link="true">jw@jonhnnyweslley.net</a>></p>
|
||||
<p>Written by Jonhnny Weslley <<a href="mailto:jw@jonhnnyweslley.net" data-bare-link="true">jw@jonhnnyweslley.net</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -136,7 +136,7 @@ whois = !sh -c 'git log -i -1 --pretty="format:%an <%ae>
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>August 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-alias(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-ARCHIVE\-FILE" "1" "April 2015" "" ""
|
||||
.TH "GIT\-ARCHIVE\-FILE" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-archive\-file\fR \- Export the current HEAD of the git repository to a archive
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Philipp Klose <<a href="mailto:me@thehippo.de" data-bare-link="true">me@thehippo.de</a>></p>
|
||||
<p>Written by Philipp Klose <<a href="mailto:me@thehippo.de" data-bare-link="true">me@thehippo.de</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -111,7 +111,7 @@
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>April 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-archive-file(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-AUTHORS" "1" "April 2015" "" ""
|
||||
.TH "GIT\-AUTHORS" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-authors\fR \- Generate authors report
|
||||
|
|
@ -35,8 +35,21 @@ Listing authors:
|
|||
.IP
|
||||
$ git authors \-\-list
|
||||
.
|
||||
.IP
|
||||
\fBTJ Holowaychuk <tj@vision\-media\.ca> Tj Holowaychuk <tj@vision\-media\.ca> hemanth\.hm <hemanth\.hm@gmail\.com> Jonhnny Weslley <jw@jonhnnyweslley\.net> nickl\- <github@jigsoft\.co\.za> Leila Muhtasib <muhtasib@gmail\.com>\fR
|
||||
.IP "" 4
|
||||
.
|
||||
.nf
|
||||
|
||||
TJ Holowaychuk <tj@vision\-media\.ca>
|
||||
Tj Holowaychuk <tj@vision\-media\.ca>
|
||||
hemanth\.hm <hemanth\.hm@gmail\.com>
|
||||
Jonhnny Weslley <jw@jonhnnyweslley\.net>
|
||||
nickl\- <github@jigsoft\.co\.za>
|
||||
Leila Muhtasib <muhtasib@gmail\.com>
|
||||
.
|
||||
.fi
|
||||
.
|
||||
.IP "" 0
|
||||
|
||||
.
|
||||
.SH "AUTHOR"
|
||||
Written by Titus Wormer <\fItituswormer@gmail\.com\fR>
|
||||
|
|
|
|||
|
|
@ -101,20 +101,19 @@
|
|||
|
||||
<p>$ git authors --list</p>
|
||||
|
||||
<p><code>
|
||||
TJ Holowaychuk <tj@vision-media.ca>
|
||||
<pre><code>TJ Holowaychuk <tj@vision-media.ca>
|
||||
Tj Holowaychuk <tj@vision-media.ca>
|
||||
hemanth.hm <hemanth.hm@gmail.com>
|
||||
Jonhnny Weslley <jw@jonhnnyweslley.net>
|
||||
nickl- <github@jigsoft.co.za>
|
||||
Leila Muhtasib <muhtasib@gmail.com>
|
||||
</code></p></dd>
|
||||
</code></pre></dd>
|
||||
</dl>
|
||||
|
||||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Titus Wormer <<a href="mailto:tituswormer@gmail.com" data-bare-link="true">tituswormer@gmail.com</a>></p>
|
||||
<p>Written by Titus Wormer <<a href="mailto:tituswormer@gmail.com" data-bare-link="true">tituswormer@gmail.com</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -127,7 +126,7 @@ Leila Muhtasib <muhtasib@gmail.com>
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>April 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-authors(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-BACK" "1" "April 2015" "" ""
|
||||
.TH "GIT\-BACK" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-back\fR \- Undo and Stage latest commits
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Kenneth Reitz <<a href="mailto:me@kennethreitz.com" data-bare-link="true">me@kennethreitz.com</a>></p>
|
||||
<p>Written by Kenneth Reitz <<a href="mailto:me@kennethreitz.com" data-bare-link="true">me@kennethreitz.com</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -115,7 +115,7 @@
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>April 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-back(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-BUG" "1" "April 2015" "" ""
|
||||
.TH "GIT\-BUG" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-bug\fR \- Create bug branch
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ $ git bug finish bug-123456
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Jesús Espino <<a href="mailto:jespinog@gmail.com" data-bare-link="true">jespinog@gmail.com</a>></p>
|
||||
<p>Written by Jesús Espino <<a href="mailto:jespinog@gmail.com" data-bare-link="true">jespinog@gmail.com</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -117,7 +117,7 @@ $ git bug finish bug-123456
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>April 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-bug(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-CHANGELOG" "1" "April 2015" "" ""
|
||||
.TH "GIT\-CHANGELOG" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-changelog\fR \- Generate a changelog report
|
||||
|
|
@ -61,6 +61,12 @@ When specifying a range, the oldest tag to retrieve commits from\. Commits will
|
|||
Filters out merge commits (commits with more than 1 parent) from generated changelog\.
|
||||
.
|
||||
.P
|
||||
\-m, \-\-merges\-only
|
||||
.
|
||||
.P
|
||||
Uses only merge commits (commits with more than 1 parent) for generated changelog\. It also changes the default format to include the merge commit messages body, as on github the commits subject line only contains the branch name but no information about the content of the merge\.
|
||||
.
|
||||
.P
|
||||
\-p, \-\-prune\-old
|
||||
.
|
||||
.P
|
||||
|
|
|
|||
|
|
@ -115,6 +115,10 @@
|
|||
|
||||
<p> Filters out merge commits (commits with more than 1 parent) from generated changelog.</p>
|
||||
|
||||
<p> -m, --merges-only</p>
|
||||
|
||||
<p> Uses only merge commits (commits with more than 1 parent) for generated changelog. It also changes the default format to include the merge commit messages body, as on github the commits subject line only contains the branch name but no information about the content of the merge.</p>
|
||||
|
||||
<p> -p, --prune-old</p>
|
||||
|
||||
<p> Replace existing changelog entirely with newly generated content, thereby disabling the default behavior of appending the content of any detected changelog to the end of newly generated content.</p>
|
||||
|
|
@ -159,7 +163,7 @@
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Mark Eissler <<a href="mailto:mark@mixtur.com" data-bare-link="true">mark@mixtur.com</a>></p>
|
||||
<p>Written by Mark Eissler <<a href="mailto:mark@mixtur.com" data-bare-link="true">mark@mixtur.com</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -172,7 +176,7 @@
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>April 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-changelog(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -42,6 +42,10 @@ git-changelog(1) -- Generate a changelog report
|
|||
|
||||
Filters out merge commits (commits with more than 1 parent) from generated changelog.
|
||||
|
||||
-m, --merges-only
|
||||
|
||||
Uses only merge commits (commits with more than 1 parent) for generated changelog. It also changes the default format to include the merge commit messages body, as on github the commits subject line only contains the branch name but no information about the content of the merge.
|
||||
|
||||
-p, --prune-old
|
||||
|
||||
Replace existing changelog entirely with newly generated content, thereby disabling the default behavior of appending the content of any detected changelog to the end of newly generated content.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-CHORE" "1" "April 2015" "" ""
|
||||
.TH "GIT\-CHORE" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-chore\fR \- Create chore branch
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ $ git chore finish chore-123456
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Chris Hall <<a href="mailto:christopher.k.hall@gmail.com" data-bare-link="true">christopher.k.hall@gmail.com</a>> from bug/feature/refactor comamnds originally written by Jesús Espino <<a href="mailto:jespinog@gmail.com" data-bare-link="true">jespinog@gmail.com</a>></p>
|
||||
<p>Written by Chris Hall <<a href="mailto:christopher.k.hall@gmail.com" data-bare-link="true">christopher.k.hall@gmail.com</a>> from bug/feature/refactor comamnds originally written by Jesús Espino <<a href="mailto:jespinog@gmail.com" data-bare-link="true">jespinog@gmail.com</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -117,7 +117,7 @@ $ git chore finish chore-123456
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>April 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-chore(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-CLEAR" "1" "August 2015" "" ""
|
||||
.TH "GIT\-CLEAR" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-clear\fR \- Rigorously clean up a repository
|
||||
|
|
@ -10,9 +10,7 @@
|
|||
\fBgit\-clear\fR
|
||||
.
|
||||
.SH "DESCRIPTION"
|
||||
Clears the repository to a state that it looks as if it was freshly cloned
|
||||
with the current HEAD. Basically it is a git-reset --hard together with
|
||||
deletion of all untracked files that reside inside the working directory.
|
||||
Clears the repository to a state that it looks as if it was freshly cloned with the current HEAD\. Basically it is a git\-reset \-\-hard together with deletion of all untracked files that reside inside the working directory\.
|
||||
.
|
||||
.SH "EXAMPLES"
|
||||
Clears the repo\.
|
||||
|
|
@ -21,27 +19,14 @@ Clears the repo\.
|
|||
.
|
||||
.nf
|
||||
|
||||
$ git clear
|
||||
.
|
||||
.fi
|
||||
.
|
||||
.IP "" 0
|
||||
.
|
||||
.P
|
||||
Remove the latest 3 commits:
|
||||
.
|
||||
.IP "" 4
|
||||
.
|
||||
.nf
|
||||
|
||||
$ git back 3
|
||||
$ git clear
|
||||
.
|
||||
.fi
|
||||
.
|
||||
.IP "" 0
|
||||
.
|
||||
.SH "AUTHOR"
|
||||
Written by Daniel Brendle <\fIgrindhold@gmx\.net\fR>
|
||||
Written by Daniel \'grindhold\' Brendle <\fIgrindhold@gmx\.net\fR>
|
||||
.
|
||||
.SH "REPORTING BUGS"
|
||||
<\fIhttps://github\.com/tj/git\-extras/issues\fR>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<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-clear(1) - Undo and Stage latest commits</title>
|
||||
<title>git-clear(1) - Rigorously clean up a repository </title>
|
||||
<style type='text/css' media='all'>
|
||||
/* style: man */
|
||||
body#manpage {margin:0}
|
||||
|
|
@ -56,7 +56,6 @@
|
|||
<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>
|
||||
|
|
@ -71,7 +70,7 @@
|
|||
|
||||
<h2 id="NAME">NAME</h2>
|
||||
<p class="man-name">
|
||||
<code>git-clear</code> - <span class="man-whatis">Rigorously clean up a repository</span>
|
||||
<code>git-clear</code> - <span class="man-whatis">Rigorously clean up a repository </span>
|
||||
</p>
|
||||
|
||||
<h2 id="SYNOPSIS">SYNOPSIS</h2>
|
||||
|
|
@ -80,11 +79,9 @@
|
|||
|
||||
<h2 id="DESCRIPTION">DESCRIPTION</h2>
|
||||
|
||||
<p>
|
||||
Clears the repository to a state that it looks as if it was freshly cloned
|
||||
with the current HEAD. Basically it is a git-reset --hard together with
|
||||
deletion of all untracked files that reside inside the working directory.
|
||||
</p>
|
||||
<p> Clears the repository to a state that it looks as if it was freshly cloned
|
||||
with the current HEAD. Basically it is a git-reset --hard together with
|
||||
deletion of all untracked files that reside inside the working directory.</p>
|
||||
|
||||
<h2 id="EXAMPLES">EXAMPLES</h2>
|
||||
|
||||
|
|
@ -95,7 +92,7 @@ deletion of all untracked files that reside inside the working directory.
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Daniel 'grindhold' Brendle</p>
|
||||
<p>Written by Daniel 'grindhold' Brendle <<a href="mailto:grindhold@gmx.net" data-bare-link="true">grindhold@gmx.net</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -108,7 +105,7 @@ deletion of all untracked files that reside inside the working directory.
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>August 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-clear(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-COMMITS\-SINCE" "1" "April 2015" "" ""
|
||||
.TH "GIT\-COMMITS\-SINCE" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-commits\-since\fR \- Show commit logs since some date
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ TJ Holowaychuk - Merge pull request #129 from nickl-/develop
|
|||
|
||||
<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>
|
||||
<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>
|
||||
|
||||
|
|
@ -126,7 +126,7 @@ TJ Holowaychuk - Merge pull request #129 from nickl-/develop
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>April 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-commits-since(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-CONTRIB" "1" "August 2015" "" "Git Extras"
|
||||
.TH "GIT\-CONTRIB" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-contrib\fR \- Show user\'s contributions
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@
|
|||
|
||||
<ol class='man-decor man-head man head'>
|
||||
<li class='tl'>git-contrib(1)</li>
|
||||
<li class='tc'>Git Extras</li>
|
||||
<li class='tc'></li>
|
||||
<li class='tr'>git-contrib(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
@ -114,7 +114,7 @@ visionmedia (18):
|
|||
|
||||
<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>
|
||||
<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>
|
||||
|
||||
|
|
@ -127,7 +127,7 @@ visionmedia (18):
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>August 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-contrib(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-COUNT" "1" "April 2015" "" ""
|
||||
.TH "GIT\-COUNT" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-count\fR \- Show commit count
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ total 1844
|
|||
|
||||
<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>
|
||||
<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>
|
||||
|
||||
|
|
@ -138,7 +138,7 @@ total 1844
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>April 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-count(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-CREATE\-BRANCH" "1" "April 2015" "" ""
|
||||
.TH "GIT\-CREATE\-BRANCH" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-create\-branch\fR \- Create branches
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Jonhnny Weslley <<a href="mailto:jw@jonhnnyweslley.net" data-bare-link="true">jw@jonhnnyweslley.net</a>></p>
|
||||
<p>Written by Jonhnny Weslley <<a href="mailto:jw@jonhnnyweslley.net" data-bare-link="true">jw@jonhnnyweslley.net</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -108,7 +108,7 @@
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>April 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-create-branch(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-DELETE\-BRANCH" "1" "April 2015" "" ""
|
||||
.TH "GIT\-DELETE\-BRANCH" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-delete\-branch\fR \- Delete branches
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ $ git delete-branch integration bug/1234
|
|||
|
||||
<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>
|
||||
<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>
|
||||
|
||||
|
|
@ -111,7 +111,7 @@ $ git delete-branch integration bug/1234
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>April 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-delete-branch(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-DELETE\-MERGED\-BRANCHES" "1" "April 2015" "" ""
|
||||
.TH "GIT\-DELETE\-MERGED\-BRANCHES" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-delete\-merged\-branches\fR \- Delete merged branches
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Jesús Espino <<a href="mailto:jespinog@gmail.com" data-bare-link="true">jespinog@gmail.com</a>></p>
|
||||
<p>Written by Jesús Espino <<a href="mailto:jespinog@gmail.com" data-bare-link="true">jespinog@gmail.com</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -102,7 +102,7 @@
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>April 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-delete-merged-branches(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-DELETE\-SUBMODULE" "1" "April 2015" "" ""
|
||||
.TH "GIT\-DELETE\-SUBMODULE" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-delete\-submodule\fR \- Delete submodules
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Jonhnny Weslley <<a href="mailto:jw@jonhnnyweslley.net" data-bare-link="true">jw@jonhnnyweslley.net</a>></p>
|
||||
<p>Written by Jonhnny Weslley <<a href="mailto:jw@jonhnnyweslley.net" data-bare-link="true">jw@jonhnnyweslley.net</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -106,7 +106,7 @@
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>April 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-delete-submodule(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-DELETE\-TAG" "1" "April 2015" "" ""
|
||||
.TH "GIT\-DELETE\-TAG" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-delete\-tag\fR \- Delete tags
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ $ git delete-tag 0.0.1 0.0.2
|
|||
|
||||
<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>
|
||||
<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>
|
||||
|
||||
|
|
@ -110,7 +110,7 @@ $ git delete-tag 0.0.1 0.0.2
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>April 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-delete-tag(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-DELTA" "1" "April 2015" "" ""
|
||||
.TH "GIT\-DELTA" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-delta\fR \- Lists changed files
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Ivan Malopinsky <<a href="mailto:hello@imsky.co" data-bare-link="true">hello@imsky.co</a>></p>
|
||||
<p>Written by Ivan Malopinsky <<a href="mailto:hello@imsky.co" data-bare-link="true">hello@imsky.co</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -108,7 +108,7 @@
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>April 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-delta(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-EFFORT" "1" "August 2015" "" "Git Extras"
|
||||
.TH "GIT\-EFFORT" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-effort\fR \- Show effort statistics on file(s)
|
||||
.
|
||||
.SH "SYNOPSIS"
|
||||
\fBgit\-effort\fR [\-\-above <value>] [<options>] [[\-\-] <path>\.\.\.]
|
||||
\fBgit\-effort\fR [\-\-above <value>] [<path>\.\.\.] [\-\- [<log options>\.\.\.]]
|
||||
.
|
||||
.SH "DESCRIPTION"
|
||||
Shows effort statistics about files in the repository\.
|
||||
|
|
@ -28,23 +28,20 @@ Display includes:
|
|||
Ignore files with commits <= a value\.
|
||||
.
|
||||
.P
|
||||
Run
|
||||
.
|
||||
.br
|
||||
man \-P \'less +/Commit\e Limiting\' git\-log
|
||||
.
|
||||
.br
|
||||
to read about options to limit which commits are counted\.
|
||||
.
|
||||
.P
|
||||
Note: \fBgit\-effort\fR does not accept commit ranges\.
|
||||
.
|
||||
.P
|
||||
[\-\-] <path>\.\.\.
|
||||
<path>\.\.\.
|
||||
.
|
||||
.P
|
||||
Only count commits that touches the given paths\.
|
||||
.
|
||||
.P
|
||||
Note: \fBgit\-effort\fR does not accept revision ranges, but the underlying \fBgit log\fR does (See the examples)\.
|
||||
.
|
||||
.P
|
||||
<log options>\.\.\.
|
||||
.
|
||||
.P
|
||||
Options for \fBgit log\fR\. Note that you must use \fB\-\-\fR to separate options to \fBgit log\fR from options to \fBgit effort\fR\. This makes it possible to only count commits you are interested in\. Not all options are relevant in the context of \fBgit\-effort\fR, but those that are is listed under the "Commit Limiting" section on the \fBgit\-log\fR manpages\.
|
||||
.
|
||||
.SH "EXAMPLES"
|
||||
Note: Output will first appear unsorted, then the screen is cleared and the sorted list is output\. The initial unsorted list is not shown in the examples for brevity\.
|
||||
.
|
||||
|
|
@ -70,7 +67,7 @@ $ git effort \-\-above 5
|
|||
git\-repl 7 5
|
||||
|
||||
|
||||
$ git effort \-\-after="one year ago" \-\-above 5 \-\-author="Leila Muhtasib"
|
||||
$ git effort \-\-above 5 bin/* \-\- \-\-after="one year ago" \-\-author="Leila Muhtasib"
|
||||
|
||||
file commits active days
|
||||
|
||||
|
|
@ -86,18 +83,37 @@ $ git effort \-\-after="one year ago" \-\-above 5 \-\-author="Leila Muhtasib"
|
|||
.IP "" 0
|
||||
.
|
||||
.P
|
||||
Showing statistics on directories is also possible
|
||||
Showing statistics on directories is also possible:
|
||||
.
|
||||
.IP "" 4
|
||||
.
|
||||
.nf
|
||||
|
||||
$ git effort bin man
|
||||
$ git effort bin man \-\- \-\-after="one year ago"
|
||||
|
||||
file commits active days
|
||||
|
||||
bin\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\. 406 232
|
||||
man\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\. 118 80
|
||||
bin\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\. 406 232
|
||||
man\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\. 118 80
|
||||
.
|
||||
.fi
|
||||
.
|
||||
.IP "" 0
|
||||
.
|
||||
.P
|
||||
Only count commits in the specified revision range:
|
||||
.
|
||||
.P
|
||||
$ git effort \-\- master\.\.feature
|
||||
.
|
||||
.IP "" 4
|
||||
.
|
||||
.nf
|
||||
|
||||
file commits active days
|
||||
|
||||
bin/git\-effort\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\. 3 2
|
||||
man/git\-effort\.md\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\. 1 1
|
||||
.
|
||||
.fi
|
||||
.
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@
|
|||
|
||||
<ol class='man-decor man-head man head'>
|
||||
<li class='tl'>git-effort(1)</li>
|
||||
<li class='tc'>Git Extras</li>
|
||||
<li class='tc'></li>
|
||||
<li class='tr'>git-effort(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
@ -76,7 +76,7 @@
|
|||
|
||||
<h2 id="SYNOPSIS">SYNOPSIS</h2>
|
||||
|
||||
<p><code>git-effort</code> [--above <value>] [<options>] [[--] <path>...]</p>
|
||||
<p><code>git-effort</code> [--above <value>] [<path>...] [-- [<log options>...]]</p>
|
||||
|
||||
<h2 id="DESCRIPTION">DESCRIPTION</h2>
|
||||
|
||||
|
|
@ -92,16 +92,19 @@
|
|||
|
||||
<p> Ignore files with commits <= a value.</p>
|
||||
|
||||
<p> Run<br />
|
||||
man -P 'less +/Commit\ Limiting' git-log<br />
|
||||
to read about options to limit which commits are counted.</p>
|
||||
|
||||
<p> Note: <code>git-effort</code> does not accept commit ranges.</p>
|
||||
|
||||
<p> [--] <path>...</p>
|
||||
<p> <path>...</p>
|
||||
|
||||
<p> Only count commits that touches the given paths.</p>
|
||||
|
||||
<p> Note: <code>git-effort</code> does not accept revision ranges, but the underlying <code>git log</code> does (See the examples).</p>
|
||||
|
||||
<p> <log options>...</p>
|
||||
|
||||
<p> Options for <code>git log</code>. Note that you must use <code>--</code> to separate options to <code>git log</code>
|
||||
from options to <code>git effort</code>.
|
||||
This makes it possible to only count commits you are interested in.
|
||||
Not all options are relevant in the context of <code>git-effort</code>, but those that are is listed under the "Commit Limiting" section on the <code>git-log</code> manpages.</p>
|
||||
|
||||
<h2 id="EXAMPLES">EXAMPLES</h2>
|
||||
|
||||
<p> Note: Output will first appear unsorted, then the screen is cleared and the sorted
|
||||
|
|
@ -124,7 +127,7 @@
|
|||
git-repl 7 5
|
||||
|
||||
|
||||
$ git effort --after="one year ago" --above 5 --author="Leila Muhtasib"
|
||||
$ git effort --above 5 bin/* -- --after="one year ago" --author="Leila Muhtasib"
|
||||
|
||||
file commits active days
|
||||
|
||||
|
|
@ -136,19 +139,29 @@ $ git effort --after="one year ago" --above 5 --author="Leila Muhtasib"
|
|||
git-graft 2 2
|
||||
</code></pre>
|
||||
|
||||
<p> Showing statistics on directories is also possible</p>
|
||||
<p> Showing statistics on directories is also possible:</p>
|
||||
|
||||
<pre><code>$ git effort bin man
|
||||
<pre><code>$ git effort bin man -- --after="one year ago"
|
||||
|
||||
file commits active days
|
||||
|
||||
bin.......................................... 406 232
|
||||
man.......................................... 118 80
|
||||
bin.......................................... 406 232
|
||||
man.......................................... 118 80
|
||||
</code></pre>
|
||||
|
||||
<p> Only count commits in the specified revision range:</p>
|
||||
|
||||
<p> $ git effort -- master..feature</p>
|
||||
|
||||
<pre><code> file commits active days
|
||||
|
||||
bin/git-effort............................... 3 2
|
||||
man/git-effort.md............................ 1 1
|
||||
</code></pre>
|
||||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Leila Muhtasib <<a href="mailto:muhtasib@gmail.com" data-bare-link="true">muhtasib@gmail.com</a>></p>
|
||||
<p>Written by Leila Muhtasib <<a href="mailto:muhtasib@gmail.com" data-bare-link="true">muhtasib@gmail.com</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -161,7 +174,7 @@ $ git effort --after="one year ago" --above 5 --author="Leila Muhtasib"
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>August 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-effort(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ git-effort(1) -- Show effort statistics on file(s)
|
|||
|
||||
## SYNOPSIS
|
||||
|
||||
`git-effort` [--above <value>] [<options>] [[--] <path>...]
|
||||
`git-effort` [--above <value>] [<path>...] [-- [<log options>...]]
|
||||
|
||||
## DESCRIPTION
|
||||
|
||||
|
|
@ -19,16 +19,19 @@ git-effort(1) -- Show effort statistics on file(s)
|
|||
|
||||
Ignore files with commits <= a value.
|
||||
|
||||
Run
|
||||
man -P 'less +/Commit\ Limiting' git-log
|
||||
to read about options to limit which commits are counted.
|
||||
|
||||
Note: `git-effort` does not accept commit ranges.
|
||||
|
||||
[--] <path>...
|
||||
<path>...
|
||||
|
||||
Only count commits that touches the given paths.
|
||||
|
||||
Note: `git-effort` does not accept revision ranges, but the underlying `git log` does (See the examples).
|
||||
|
||||
<log options>...
|
||||
|
||||
Options for `git log`. Note that you must use `--` to separate options to `git log`
|
||||
from options to `git effort`.
|
||||
This makes it possible to only count commits you are interested in.
|
||||
Not all options are relevant in the context of `git-effort`, but those that are is listed under the "Commit Limiting" section on the `git-log` manpages.
|
||||
|
||||
## EXAMPLES
|
||||
|
||||
Note: Output will first appear unsorted, then the screen is cleared and the sorted
|
||||
|
|
@ -51,7 +54,7 @@ git-effort(1) -- Show effort statistics on file(s)
|
|||
git-repl 7 5
|
||||
|
||||
|
||||
$ git effort --after="one year ago" --above 5 --author="Leila Muhtasib"
|
||||
$ git effort --above 5 bin/* -- --after="one year ago" --author="Leila Muhtasib"
|
||||
|
||||
file commits active days
|
||||
|
||||
|
|
@ -62,14 +65,23 @@ git-effort(1) -- Show effort statistics on file(s)
|
|||
git-changelog 3 2
|
||||
git-graft 2 2
|
||||
|
||||
Showing statistics on directories is also possible
|
||||
Showing statistics on directories is also possible:
|
||||
|
||||
$ git effort bin man
|
||||
$ git effort bin man -- --after="one year ago"
|
||||
|
||||
file commits active days
|
||||
|
||||
bin.......................................... 406 232
|
||||
man.......................................... 118 80
|
||||
bin.......................................... 406 232
|
||||
man.......................................... 118 80
|
||||
|
||||
Only count commits in the specified revision range:
|
||||
|
||||
$ git effort -- master..feature
|
||||
|
||||
file commits active days
|
||||
|
||||
bin/git-effort............................... 3 2
|
||||
man/git-effort.md............................ 1 1
|
||||
|
||||
|
||||
## AUTHOR
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-EXTRAS" "1" "June 2015" "" ""
|
||||
.TH "GIT\-EXTRAS" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-extras\fR \- Awesome GIT utilities
|
||||
|
|
@ -51,6 +51,9 @@ Self update\.
|
|||
\fBgit\-chore(1)\fR Create chore branch
|
||||
.
|
||||
.IP "\(bu" 4
|
||||
\fBgit\-clear(1)\fR Rigorously clean up a repository
|
||||
.
|
||||
.IP "\(bu" 4
|
||||
\fBgit\-commits\-since(1)\fR Show commit logs since some date
|
||||
.
|
||||
.IP "\(bu" 4
|
||||
|
|
@ -81,7 +84,7 @@ Self update\.
|
|||
\fBgit\-effort(1)\fR Show effort statistics on file(s)
|
||||
.
|
||||
.IP "\(bu" 4
|
||||
\fBgit\-feature(1)\fR Create feature branch
|
||||
\fBgit\-feature(1)\fR Create/Merge feature branch
|
||||
.
|
||||
.IP "\(bu" 4
|
||||
\fBgit\-fork(1)\fR Fork a repo on github
|
||||
|
|
@ -99,6 +102,9 @@ Self update\.
|
|||
\fBgit\-guilt(1)\fR calculate change between two revisions
|
||||
.
|
||||
.IP "\(bu" 4
|
||||
\fBgit\-ignore\-io(1)\fR Get sample gitignore file
|
||||
.
|
||||
.IP "\(bu" 4
|
||||
\fBgit\-ignore(1)\fR Add \.gitignore patterns
|
||||
.
|
||||
.IP "\(bu" 4
|
||||
|
|
@ -129,6 +135,9 @@ Self update\.
|
|||
\fBgit\-pr(1)\fR Checks out a pull request locally
|
||||
.
|
||||
.IP "\(bu" 4
|
||||
\fBgit\-psykorebase(1)\fR Rebase a branch with a merge commit
|
||||
.
|
||||
.IP "\(bu" 4
|
||||
\fBgit\-rebase\-patch(1)\fR Rebases a patch
|
||||
.
|
||||
.IP "\(bu" 4
|
||||
|
|
@ -153,6 +162,9 @@ Self update\.
|
|||
\fBgit\-scp(1)\fR Copy files to SSH compatible \fBgit\-remote\fR
|
||||
.
|
||||
.IP "\(bu" 4
|
||||
\fBgit\-sed(1)\fR replace patterns in git\-controlled files
|
||||
.
|
||||
.IP "\(bu" 4
|
||||
\fBgit\-setup(1)\fR Set up a git repository
|
||||
.
|
||||
.IP "\(bu" 4
|
||||
|
|
|
|||
|
|
@ -101,6 +101,7 @@
|
|||
<li> <strong><a class="man-ref" href="git-bug.html">git-bug<span class="s">(1)</span></a></strong> Create bug branch</li>
|
||||
<li> <strong><a class="man-ref" href="git-changelog.html">git-changelog<span class="s">(1)</span></a></strong> Generate a changelog report</li>
|
||||
<li> <strong><a class="man-ref" href="git-chore.html">git-chore<span class="s">(1)</span></a></strong> Create chore branch</li>
|
||||
<li> <strong><a class="man-ref" href="git-clear.html">git-clear<span class="s">(1)</span></a></strong> Rigorously clean up a repository</li>
|
||||
<li> <strong><a class="man-ref" href="git-commits-since.html">git-commits-since<span class="s">(1)</span></a></strong> Show commit logs since some date</li>
|
||||
<li> <strong><a class="man-ref" href="git-contrib.html">git-contrib<span class="s">(1)</span></a></strong> Show user's contributions</li>
|
||||
<li> <strong><a class="man-ref" href="git-count.html">git-count<span class="s">(1)</span></a></strong> Show commit count</li>
|
||||
|
|
@ -111,12 +112,13 @@
|
|||
<li> <strong><a class="man-ref" href="git-delete-tag.html">git-delete-tag<span class="s">(1)</span></a></strong> Delete tags</li>
|
||||
<li> <strong><a class="man-ref" href="git-delta.html">git-delta<span class="s">(1)</span></a></strong> Lists changed files</li>
|
||||
<li> <strong><a class="man-ref" href="git-effort.html">git-effort<span class="s">(1)</span></a></strong> Show effort statistics on file(s)</li>
|
||||
<li> <strong><a class="man-ref" href="git-feature.html">git-feature<span class="s">(1)</span></a></strong> Create feature branch</li>
|
||||
<li> <strong><a class="man-ref" href="git-feature.html">git-feature<span class="s">(1)</span></a></strong> Create/Merge feature branch</li>
|
||||
<li> <strong><a class="man-ref" href="git-fork.html">git-fork<span class="s">(1)</span></a></strong> Fork a repo on github</li>
|
||||
<li> <strong><a class="man-ref" href="git-fresh-branch.html">git-fresh-branch<span class="s">(1)</span></a></strong> Create fresh branches</li>
|
||||
<li> <strong><a class="man-ref" href="git-gh-pages.html">git-gh-pages<span class="s">(1)</span></a></strong> Create the GitHub Pages branch</li>
|
||||
<li> <strong><a class="man-ref" href="git-graft.html">git-graft<span class="s">(1)</span></a></strong> Merge and destroy a given branch</li>
|
||||
<li> <strong><a class="man-ref" href="git-guilt.html">git-guilt<span class="s">(1)</span></a></strong> calculate change between two revisions</li>
|
||||
<li> <strong><a class="man-ref" href="git-ignore-io.html">git-ignore-io<span class="s">(1)</span></a></strong> Get sample gitignore file</li>
|
||||
<li> <strong><a class="man-ref" href="git-ignore.html">git-ignore<span class="s">(1)</span></a></strong> Add .gitignore patterns</li>
|
||||
<li> <strong><a class="man-ref" href="git-info.html">git-info<span class="s">(1)</span></a></strong> Returns information on current repository</li>
|
||||
<li> <strong><a class="man-ref" href="git-line-summary.html">git-line-summary<span class="s">(1)</span></a></strong> Show repository summary by line</li>
|
||||
|
|
@ -127,6 +129,7 @@
|
|||
<li> <strong><a class="man-ref" href="git-merge-repo.html">git-merge-repo<span class="s">(1)</span></a></strong> Merge two repo histories</li>
|
||||
<li> <strong><a class="man-ref" href="git-missing.html">git-missing<span class="s">(1)</span></a></strong> Show commits missing from another branch</li>
|
||||
<li> <strong><a class="man-ref" href="git-pr.html">git-pr<span class="s">(1)</span></a></strong> Checks out a pull request locally</li>
|
||||
<li> <strong><a class="man-ref" href="git-psykorebase.html">git-psykorebase<span class="s">(1)</span></a></strong> Rebase a branch with a merge commit</li>
|
||||
<li> <strong><a class="man-ref" href="git-rebase-patch.html">git-rebase-patch<span class="s">(1)</span></a></strong> Rebases a patch</li>
|
||||
<li> <strong><a class="man-ref" href="git-refactor.html">git-refactor<span class="s">(1)</span></a></strong> Create refactor branch</li>
|
||||
<li> <strong><a class="man-ref" href="git-release.html">git-release<span class="s">(1)</span></a></strong> Commit, tag and push changes to the repository</li>
|
||||
|
|
@ -135,6 +138,7 @@
|
|||
<li> <strong><a class="man-ref" href="git-reset-file.html">git-reset-file<span class="s">(1)</span></a></strong> Reset one file</li>
|
||||
<li> <strong><a class="man-ref" href="git-root.html">git-root<span class="s">(1)</span></a></strong> show path of root</li>
|
||||
<li> <strong><a class="man-ref" href="git-scp.html">git-scp<span class="s">(1)</span></a></strong> Copy files to SSH compatible <code>git-remote</code></li>
|
||||
<li> <strong><a class="man-ref" href="git-sed.html">git-sed<span class="s">(1)</span></a></strong> replace patterns in git-controlled files</li>
|
||||
<li> <strong><a class="man-ref" href="git-setup.html">git-setup<span class="s">(1)</span></a></strong> Set up a git repository</li>
|
||||
<li> <strong><a class="man-ref" href="git-show-merged-branches.html">git-show-merged-branches<span class="s">(1)</span></a></strong> Show merged branches</li>
|
||||
<li> <strong><a class="man-ref" href="git-show-tree.html">git-show-tree<span class="s">(1)</span></a></strong> show branch tree of commit history</li>
|
||||
|
|
@ -149,7 +153,7 @@
|
|||
|
||||
<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>
|
||||
<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>
|
||||
|
||||
|
|
@ -162,7 +166,7 @@
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>June 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-extras(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ git-extras(1) -- Awesome GIT utilities
|
|||
- **git-bug(1)** Create bug branch
|
||||
- **git-changelog(1)** Generate a changelog report
|
||||
- **git-chore(1)** Create chore branch
|
||||
- **git-clear(1)** Rigorously clean up a repository
|
||||
- **git-commits-since(1)** Show commit logs since some date
|
||||
- **git-contrib(1)** Show user's contributions
|
||||
- **git-count(1)** Show commit count
|
||||
|
|
@ -38,12 +39,13 @@ git-extras(1) -- Awesome GIT utilities
|
|||
- **git-delete-tag(1)** Delete tags
|
||||
- **git-delta(1)** Lists changed files
|
||||
- **git-effort(1)** Show effort statistics on file(s)
|
||||
- **git-feature(1)** Create feature branch
|
||||
- **git-feature(1)** Create/Merge feature branch
|
||||
- **git-fork(1)** Fork a repo on github
|
||||
- **git-fresh-branch(1)** Create fresh branches
|
||||
- **git-gh-pages(1)** Create the GitHub Pages branch
|
||||
- **git-graft(1)** Merge and destroy a given branch
|
||||
- **git-guilt(1)** calculate change between two revisions
|
||||
- **git-ignore-io(1)** Get sample gitignore file
|
||||
- **git-ignore(1)** Add .gitignore patterns
|
||||
- **git-info(1)** Returns information on current repository
|
||||
- **git-line-summary(1)** Show repository summary by line
|
||||
|
|
@ -54,6 +56,7 @@ git-extras(1) -- Awesome GIT utilities
|
|||
- **git-merge-repo(1)** Merge two repo histories
|
||||
- **git-missing(1)** Show commits missing from another branch
|
||||
- **git-pr(1)** Checks out a pull request locally
|
||||
- **git-psykorebase(1)** Rebase a branch with a merge commit
|
||||
- **git-rebase-patch(1)** Rebases a patch
|
||||
- **git-refactor(1)** Create refactor branch
|
||||
- **git-release(1)** Commit, tag and push changes to the repository
|
||||
|
|
@ -62,6 +65,7 @@ git-extras(1) -- Awesome GIT utilities
|
|||
- **git-reset-file(1)** Reset one file
|
||||
- **git-root(1)** show path of root
|
||||
- **git-scp(1)** Copy files to SSH compatible `git-remote`
|
||||
- **git-sed(1)** replace patterns in git-controlled files
|
||||
- **git-setup(1)** Set up a git repository
|
||||
- **git-show-merged-branches(1)** Show merged branches
|
||||
- **git-show-tree(1)** show branch tree of commit history
|
||||
|
|
|
|||
|
|
@ -1,18 +1,24 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-FEATURE" "1" "April 2015" "" ""
|
||||
.TH "GIT\-FEATURE" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-feature\fR \- Create feature branch
|
||||
\fBgit\-feature\fR \- Create/Merge feature branch
|
||||
.
|
||||
.SH "SYNOPSIS"
|
||||
\fBgit\-feature\fR [finish] <name>
|
||||
\fBgit\-feature\fR [\-a|\-\-alias branch_prefix] [finish] <name>
|
||||
.
|
||||
.SH "DESCRIPTION"
|
||||
Create the given feature branch
|
||||
Create/Merge the given feature branch
|
||||
.
|
||||
.SH "OPTIONS"
|
||||
<\-a|\-\-alias branch_prefix>
|
||||
.
|
||||
.P
|
||||
use \fBbranch_prefix\fR instead of \fBfeature\fR
|
||||
.
|
||||
.P
|
||||
<finish>
|
||||
.
|
||||
.P
|
||||
|
|
@ -30,10 +36,16 @@ The name of the feature branch\.
|
|||
|
||||
$ git feature dependencies
|
||||
\.\.\.
|
||||
$ git commit \-m "Some changes"
|
||||
$ (feature/dependencies) git commit \-m "Some changes"
|
||||
\.\.\.
|
||||
$ git checkout master
|
||||
$ (feature/dependencies) git checkout master
|
||||
$ git feature finish dependencies
|
||||
|
||||
$ git alias features "feature \-a features"
|
||||
$ git features dependencies
|
||||
$ (features/dependencies) \.\.\.
|
||||
$ (features/dependencies) git checkout master
|
||||
$ git features finish dependencies
|
||||
.
|
||||
.fi
|
||||
.
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<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-feature(1) - Create feature branch</title>
|
||||
<title>git-feature(1) - Create/Merge feature branch</title>
|
||||
<style type='text/css' media='all'>
|
||||
/* style: man */
|
||||
body#manpage {margin:0}
|
||||
|
|
@ -71,19 +71,23 @@
|
|||
|
||||
<h2 id="NAME">NAME</h2>
|
||||
<p class="man-name">
|
||||
<code>git-feature</code> - <span class="man-whatis">Create feature branch</span>
|
||||
<code>git-feature</code> - <span class="man-whatis">Create/Merge feature branch</span>
|
||||
</p>
|
||||
|
||||
<h2 id="SYNOPSIS">SYNOPSIS</h2>
|
||||
|
||||
<p><code>git-feature</code> [finish] <name></p>
|
||||
<p><code>git-feature</code> [-a|--alias branch_prefix] [finish] <name></p>
|
||||
|
||||
<h2 id="DESCRIPTION">DESCRIPTION</h2>
|
||||
|
||||
<p> Create the given feature branch</p>
|
||||
<p> Create/Merge the given feature branch</p>
|
||||
|
||||
<h2 id="OPTIONS">OPTIONS</h2>
|
||||
|
||||
<p> <-a|--alias branch_prefix></p>
|
||||
|
||||
<p> use <code>branch_prefix</code> instead of <code>feature</code></p>
|
||||
|
||||
<p> <finish></p>
|
||||
|
||||
<p> Merge and delete the feature branch.</p>
|
||||
|
|
@ -96,15 +100,21 @@
|
|||
|
||||
<pre><code>$ git feature dependencies
|
||||
...
|
||||
$ git commit -m "Some changes"
|
||||
$ (feature/dependencies) git commit -m "Some changes"
|
||||
...
|
||||
$ git checkout master
|
||||
$ (feature/dependencies) git checkout master
|
||||
$ git feature finish dependencies
|
||||
|
||||
$ git alias features "feature -a features"
|
||||
$ git features dependencies
|
||||
$ (features/dependencies) ...
|
||||
$ (features/dependencies) git checkout master
|
||||
$ git features finish dependencies
|
||||
</code></pre>
|
||||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Jesús Espino <<a href="mailto:jespinog@gmail.com" data-bare-link="true">jespinog@gmail.com</a>></p>
|
||||
<p>Written by Jesús Espino <<a href="mailto:jespinog@gmail.com" data-bare-link="true">jespinog@gmail.com</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -117,7 +127,7 @@ $ git feature finish dependencies
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>April 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-feature(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,20 @@
|
|||
git-feature(1) -- Create feature branch
|
||||
git-feature(1) -- Create/Merge feature branch
|
||||
=======================================
|
||||
|
||||
## SYNOPSIS
|
||||
|
||||
`git-feature` [finish] <name>
|
||||
`git-feature` [-a|--alias branch_prefix] [finish] <name>
|
||||
|
||||
## DESCRIPTION
|
||||
|
||||
Create the given feature branch
|
||||
Create/Merge the given feature branch
|
||||
|
||||
## OPTIONS
|
||||
|
||||
<-a|--alias branch_prefix>
|
||||
|
||||
use `branch_prefix` instead of `feature`
|
||||
|
||||
<finish>
|
||||
|
||||
Merge and delete the feature branch.
|
||||
|
|
@ -23,11 +27,17 @@ git-feature(1) -- Create feature branch
|
|||
|
||||
$ git feature dependencies
|
||||
...
|
||||
$ git commit -m "Some changes"
|
||||
$ (feature/dependencies) git commit -m "Some changes"
|
||||
...
|
||||
$ git checkout master
|
||||
$ (feature/dependencies) git checkout master
|
||||
$ git feature finish dependencies
|
||||
|
||||
$ git alias features "feature -a features"
|
||||
$ git features dependencies
|
||||
$ (features/dependencies) ...
|
||||
$ (features/dependencies) git checkout master
|
||||
$ git features finish dependencies
|
||||
|
||||
## AUTHOR
|
||||
|
||||
Written by Jesús Espino <<jespinog@gmail.com>>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-FORK" "1" "August 2015" "" "Git Extras"
|
||||
.TH "GIT\-FORK" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-fork\fR \- Fork a repo on github
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
|
||||
<ol class='man-decor man-head man head'>
|
||||
<li class='tl'>git-fork(1)</li>
|
||||
<li class='tc'>Git Extras</li>
|
||||
<li class='tc'></li>
|
||||
<li class='tr'>git-fork(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
@ -82,9 +82,9 @@
|
|||
<p> Fork the given github repo. Like clone but forks first.</p>
|
||||
|
||||
<ol>
|
||||
<li> forks the repo on github</li>
|
||||
<li> clones the repo into the current dir</li>
|
||||
<li> adds the original repo as a remote called upstream</li>
|
||||
<li>forks the repo on github</li>
|
||||
<li>clones the repo into the current dir</li>
|
||||
<li>adds the original repo as a remote called upstream</li>
|
||||
</ol>
|
||||
|
||||
|
||||
|
|
@ -114,7 +114,7 @@ $ cd expect.js && git remote -v
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Andrew Griffiths <<a href="mailto:mail@andrewgriffithsonline.com" data-bare-link="true">mail@andrewgriffithsonline.com</a>></p>
|
||||
<p>Written by Andrew Griffiths <<a href="mailto:mail@andrewgriffithsonline.com" data-bare-link="true">mail@andrewgriffithsonline.com</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -127,7 +127,7 @@ $ cd expect.js && git remote -v
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>August 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-fork(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-FRESH\-BRANCH" "1" "April 2015" "" ""
|
||||
.TH "GIT\-FRESH\-BRANCH" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-fresh\-branch\fR \- Create fresh branches
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Kenneth Reitz <<a href="mailto:me@kennethreitz.com" data-bare-link="true">me@kennethreitz.com</a>></p>
|
||||
<p>Written by Kenneth Reitz <<a href="mailto:me@kennethreitz.com" data-bare-link="true">me@kennethreitz.com</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -108,7 +108,7 @@
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>April 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-fresh-branch(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-GH\-PAGES" "1" "April 2015" "" ""
|
||||
.TH "GIT\-GH\-PAGES" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-gh\-pages\fR \- Create the GitHub Pages branch
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ $
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Jesús Espino <<a href="mailto:jespinog@gmail.com" data-bare-link="true">jespinog@gmail.com</a>></p>
|
||||
<p>Written by Jesús Espino <<a href="mailto:jespinog@gmail.com" data-bare-link="true">jespinog@gmail.com</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -114,7 +114,7 @@ $
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>April 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-gh-pages(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-GRAFT" "1" "April 2015" "" ""
|
||||
.TH "GIT\-GRAFT" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-graft\fR \- Merge and destroy a given branch
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@
|
|||
|
||||
<ol class='man-decor man-head man head'>
|
||||
<li class='tl'>git-graft(1)</li>
|
||||
<li class='tc'>Git Extras</li>
|
||||
<li class='tc'></li>
|
||||
<li class='tr'>git-graft(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
@ -95,7 +95,7 @@
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Kenneth Reitz <<a href="mailto:me@kennethreitz.com" data-bare-link="true">me@kennethreitz.com</a>></p>
|
||||
<p>Written by Kenneth Reitz <<a href="mailto:me@kennethreitz.com" data-bare-link="true">me@kennethreitz.com</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -108,7 +108,7 @@
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>April 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-graft(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-GUILT" "1" "August 2015" "" "Git Extras"
|
||||
.TH "GIT\-GUILT" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-guilt\fR \- calculate change between two revisions
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@
|
|||
|
||||
<ol class='man-decor man-head man head'>
|
||||
<li class='tl'>git-guilt(1)</li>
|
||||
<li class='tc'>Git Extras</li>
|
||||
<li class='tc'></li>
|
||||
<li class='tr'>git-guilt(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
@ -148,7 +148,7 @@ spacewander +++++++++++++++++++++++++++++++++++++++++++++(112)
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by spacewander <<a href="mailto:spacewanderlzx@gmail.com" data-bare-link="true">spacewanderlzx@gmail.com</a>></p>
|
||||
<p>Written by spacewander <<a href="mailto:spacewanderlzx@gmail.com" data-bare-link="true">spacewanderlzx@gmail.com</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -161,7 +161,7 @@ spacewander +++++++++++++++++++++++++++++++++++++++++++++(112)
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>August 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-guilt(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-IGNORE\-IO" "1" "September 2015" "" ""
|
||||
.TH "GIT\-IGNORE\-IO" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-ignore\-io\fR \- Get sample gitignore file
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Lee-W <a href="mailto:cl87654321@gmail.com" data-bare-link="true">cl87654321@gmail.com</a></p>
|
||||
<p>Written by Lee-W <a href="mailto:cl87654321@gmail.com" data-bare-link="true">cl87654321@gmail.com</a></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -165,7 +165,7 @@
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>September 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-ignore-io(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-IGNORE" "1" "April 2015" "" ""
|
||||
.TH "GIT\-IGNORE" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-ignore\fR \- Add \.gitignore patterns
|
||||
|
|
|
|||
|
|
@ -188,8 +188,8 @@ index.tmp
|
|||
|
||||
<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>> and Tema Bolshakov <<a href="mailto:tweekane@gmail.com" data-bare-link="true">tweekane@gmail.com</a>>
|
||||
and Nick Lombard <<a href="mailto:github@jigsoft.co.za" data-bare-link="true">github@jigsoft.co.za</a>></p>
|
||||
<p>Written by Tj Holowaychuk <<a href="mailto:tj@vision-media.ca" data-bare-link="true">tj@vision-media.ca</a>> and Tema Bolshakov <<a href="mailto:tweekane@gmail.com" data-bare-link="true">tweekane@gmail.com</a>>
|
||||
and Nick Lombard <<a href="mailto:github@jigsoft.co.za" data-bare-link="true">github@jigsoft.co.za</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -202,7 +202,7 @@ and Nick Lombard <<a href="mailto:g
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>April 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-ignore(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-INFO" "1" "April 2015" "" ""
|
||||
.TH "GIT\-INFO" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-info\fR \- Returns information on current repository
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ branch.master.merge=refs/heads/master
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Leila Muhtasib <<a href="mailto:muhtasib@gmail.com" data-bare-link="true">muhtasib@gmail.com</a>></p>
|
||||
<p>Written by Leila Muhtasib <<a href="mailto:muhtasib@gmail.com" data-bare-link="true">muhtasib@gmail.com</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -158,7 +158,7 @@ branch.master.merge=refs/heads/master
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>April 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-info(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-LINE\-SUMMARY" "1" "May 2015" "" ""
|
||||
.TH "GIT\-LINE\-SUMMARY" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-line\-summary\fR \- Show repository summary by line
|
||||
|
|
|
|||
|
|
@ -178,7 +178,7 @@ authors :
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Newell Zhu <<a href="mailto:zlx.star@gmail.com" data-bare-link="true">zlx.star@gmail.com</a>></p>
|
||||
<p>Written by Newell Zhu <<a href="mailto:zlx.star@gmail.com" data-bare-link="true">zlx.star@gmail.com</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -191,7 +191,7 @@ authors :
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>June 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-line-summary(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-LOCAL\-COMMITS" "1" "April 2015" "" ""
|
||||
.TH "GIT\-LOCAL\-COMMITS" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-local\-commits\fR \- List local commits
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Michael Komitee <<a href="mailto:mkomitee@gmail.com" data-bare-link="true">mkomitee@gmail.com</a>></p>
|
||||
<p>Written by Michael Komitee <<a href="mailto:mkomitee@gmail.com" data-bare-link="true">mkomitee@gmail.com</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -108,7 +108,7 @@
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>April 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-local-commits(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-LOCK" "1" "April 2015" "" ""
|
||||
.TH "GIT\-LOCK" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-lock\fR \- Lock a file excluded from version control
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Julio Napuri <<a href="mailto:julionc@gmail.com" data-bare-link="true">julionc@gmail.com</a>></p>
|
||||
<p>Written by Julio Napuri <<a href="mailto:julionc@gmail.com" data-bare-link="true">julionc@gmail.com</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -108,7 +108,7 @@
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>April 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-lock(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-LOCKED" "1" "April 2015" "" ""
|
||||
.TH "GIT\-LOCKED" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-locked\fR \- ls files that have been locked
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ config/database.yml
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Kevin Woo <<a href="mailto:kevinawoo@gmail.com" data-bare-link="true">kevinawoo@gmail.com</a>></p>
|
||||
<p>Written by Kevin Woo <<a href="mailto:kevinawoo@gmail.com" data-bare-link="true">kevinawoo@gmail.com</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -103,7 +103,7 @@ config/database.yml
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>April 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-locked(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-MERGE\-INTO" "1" "August 2015" "" "Git Extras"
|
||||
.TH "GIT\-MERGE\-INTO" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-merge\-into\fR \- Merge one branch into another
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@
|
|||
|
||||
<ol class='man-decor man-head man head'>
|
||||
<li class='tl'>git-merge-into(1)</li>
|
||||
<li class='tc'>Git Extras</li>
|
||||
<li class='tc'></li>
|
||||
<li class='tr'>git-merge-into(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
@ -122,7 +122,7 @@ branch can be merged fast-forward, add <code>--ff-only</code> to avoid files cha
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by spacewander <<a href="mailto:spacewanderlzx@gmail.com" data-bare-link="true">spacewanderlzx@gmail.com</a>></p>
|
||||
<p>Written by spacewander <<a href="mailto:spacewanderlzx@gmail.com" data-bare-link="true">spacewanderlzx@gmail.com</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -135,7 +135,7 @@ branch can be merged fast-forward, add <code>--ff-only</code> to avoid files cha
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>August 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-merge-into(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-MERGE\-REPO" "1" "April 2015" "" ""
|
||||
.TH "GIT\-MERGE\-REPO" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-merge\-repo\fR \- Merge two repo histories
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Ivan Malopinsky <<a href="mailto:hello@imsky.co" data-bare-link="true">hello@imsky.co</a>></p>
|
||||
<p>Written by Ivan Malopinsky <<a href="mailto:hello@imsky.co" data-bare-link="true">hello@imsky.co</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -110,7 +110,7 @@
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>April 2015</li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tr'>git-merge-repo(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-MISSING" "1" "April 2015" "" ""
|
||||
.TH "GIT\-MISSING" "1" "December 2015" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-missing\fR \- Show commits missing from another branch
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue