Commit Graph

124 Commits

Author SHA1 Message Date
Daniel Carrillo 365a228b7f [git] Add git-squash function 2022-07-09 20:52:09 +02:00
Jim Boulter 1ff1099d05 Allow users to set a dirty-branch format 2022-04-01 10:36:35 -07:00
David Crook ecaed1cfa7 change polarity of test for BROWSER 2021-11-16 09:55:19 -08:00
Indrajit Raychaudhuri 979144d0e4 git: Update minimum required git version to 2.11
Git 2.11+ has more versatile `submodule`, `fetch`, `rebase` options for
common use-cases.
2021-05-21 13:40:49 -05:00
hidekuro c4a8f446c6 git: Use `update` instead of `foreach` in alias 'gSu'
Modern `git` can use `submodule` option `update` instead of `foreach`
to achieve approximately similar outcome.

To allows call without assuming that all submodules will have default
branch as `master`, the preferred approach would be to call
`git submodule update --remote --recursive` after registering the
correct branch for submodule in `.gitmodules`:

```
git config -f .gitmodules submodule.<path>.branch <branch>
```

For more discussion, see: https://stackoverflow.com/a/33835815

Signed-off-by: Indrajit Raychaudhuri <irc@indrajit.com>
2021-05-21 13:40:49 -05:00
Indrajit Raychaudhuri a3643f124e git: Optimize scripts for git helper functions
Optimize git internal calls and adjustment git helper functions to use
more idiomatic Zsh conventions avoiding external calls.
2021-05-21 13:40:49 -05:00
Indrajit Raychaudhuri efebe3efec git: Alias and function cleanup and formatting for clarity
Changes:
- Prefer longer form of git switch for better clarity.
- Move `-S` (`--gpg-sign`) in all the alias definitions to  the end to
  allow custom keyid.
- Simplify operations in helper functions git native calls.
- Apply minor reformatting and rearranging.
2021-05-21 13:40:49 -05:00
Indrajit Raychaudhuri 1ff9421f7b general: Update documentation better qualifying runcom paths
Zsh and Prezto files don't always reside in `~/`. Instead, they have
a more spec compliant location (`${ZDOTDIR:-$HOME}/`). Make them
unambiguous in the documentation. Likewise, for `$GNUPGHOME`.

Further, add instruction for optionally setting up Prezto in
`$XDG_CONFIG_HOME`.

While at this, also add clarification on relative ordering of some of
the modules, apply more formatting tweaks and doc improvements.
2021-05-21 12:31:02 -05:00
Indrajit Raychaudhuri d80e393f78 general: Reformat documentation with better formatting and wording
General purpose reformating and rewording in (a few places). This should
also make markdown linting happier.

Prefer back-ticks wherever useful and use `console` for code blocks to
be executed on terminal.

Also, update references links wherever possible (including update from
'http://' to 'https://').
2021-05-05 12:21:04 -05:00
Indrajit Raychaudhuri 8003d0c6d8 git: Autoload helper functions for 'run-help'
Now that, prezto is configured to lookup more specific 'run-help'
function, autoload the known one for git.
2021-04-30 03:09:07 -05:00
Zhiming Wang a132c1007a
git-info: use tab as separator for splitting ahead_and_behind (#902)
The current implementation is not tamper-proof against a modified IFS. See discussion in https://github.com/sorin-ionescu/prezto/pull/902 for details.
2020-06-29 10:26:36 -07:00
hidekuro 20a78c04e5
Remove `--all` from git alias `glg` (#1853) 2020-06-29 10:23:08 -07:00
Diego Rabatone Oliveira 649c0e4561 [git] Add git pull autostash alias
Adds the gfma and gfra aliases with the `--autostash` flag.
2020-05-14 15:19:03 -03:00
Diego Rabatone Oliveira 0e6429da97 Remove duplicated information from git module README (#1657) 2018-12-17 10:22:33 -08:00
Kaleb Elwert eee3c9c166 git: add documentation for new aliases 2018-12-13 10:51:56 -08:00
Bruno Oliveira da Silva 39e1a63349 Aliases to digital sign/verify commits and tags (#651) 2018-12-13 10:43:23 -08:00
Yutian Li dd7a26e219 [git] Also check "commondir" when looking for a stash (#1620) 2018-09-15 09:35:48 -07:00
Jeff Widman 3d911cd511 Document `gpf` vs `gpF`
Document the difference between `gpf` and `gpF`. These were changed in https://github.com/sorin-ionescu/prezto/pull/1040 / ddfc870f9a, but never documented.
2018-05-20 14:10:13 -07:00
François VANTOMME 1b441e7654 Feat (git): add an alias displaying the commits yet to be applied to upstream (#1565) 2018-04-04 15:20:21 -07:00
Diego Rabatone Oliveira b3c27bb164 Replace git with 'command git' (#1551)
to improve performance if git is aliased to hub or other wrappers.
2018-03-05 00:56:25 -08:00
Philipp A 580ddc44f3 Add another shadow to the git aliases
Originally submitted in https://github.com/sorin-ionescu/prezto/pull/979
2018-02-21 14:02:56 -08:00
Rick Jones 4325f74f9d git: add tag aliases
Originally submitted in https://github.com/sorin-ionescu/prezto/pull/1094
2018-02-21 13:48:51 -08:00
Indrajit Raychaudhuri 043d09bbfe [git] Support short-code and improve completion in 'git-hub-shorten-url'
Changes:
- Add optional short-code support
- Improve completion for github.com URL (`http(s)://*.github.com` only)
- Return with non-zero exit code appropriately
2017-11-28 16:45:28 -08:00
Indrajit Raychaudhuri a60499f933 [general] Miscellaneous cleanup and formatting 2017-08-04 13:45:56 -05:00
Indrajit Raychaudhuri ac628c9059 [general] Switch code block formatting to use fence formatting
Changes:
* Indented code block doesn't support syntax highlighting, use fenced
formatting (```) instead for better syntax highlighting
* Wrap commands/functions in backticks
* Typo fixes
2017-07-22 13:11:29 -05:00
Indrajit Raychaudhuri c1a8fc0469 Cleanup spurious whitespace 2017-07-13 16:41:33 -05:00
Zhiming Wang d25b251ef7 git: Add revert to special action contexts
revert is very similar to cherry-pick and has a sequence variant.
2017-07-11 12:18:19 -07:00
Khai Do ebae698f70 change alias to gfcr 2017-07-11 12:10:18 -07:00
Khai Do d69070268a add alias for cloning a repo including all submodules 2017-07-11 12:10:18 -07:00
Indrajit Raychaudhuri e6136a517b [git] Fix 'git-hub-shorten-url' helper
Changes:
- Use git.io over 'https'
- Add extra check to conform to *.github.com URLs
- Use built-in _urls function for completion
- Update readme with GitHub blog URL
2017-07-07 13:52:17 -07:00
Kaleb Elwert 7d5beeab51 Add comments into each of the function files to make them easier to find 2017-07-06 16:13:36 -07:00
Ihab Soliman a75c63768c Add git aliases for signing commits (#1126) 2017-06-19 01:40:44 -07:00
Kaleb Elwert 46a1ffaf7e Add gbr and gbR aliases to module readme 2017-05-01 09:43:12 -07:00
Kyle Rich 3d7a8c2870 Add some new git aliases, modify a few more. (#1301)
* Add some new git aliases, modify a few more.
* Add `gbV` command to show more verbose git branch info.
* Add `gcam` to make it possible to execute `gca; gcm '<your message
  here>'` more simply.
* Add `gii` command to temporarily untrack (ignore) a file.
* Add `giI` command to uningore a file.
* Change alias of `gbl` to `gbv`. Personally, I think aliases that
  include a switch in the command should include the switch in the alias
  if possible.  This makes them easier to remember.
* Change alias of `gbL` to `gba`. I think the `-a` switch is more
  salient to what this alias does than the `-v`.  Furthermore, with this
  PR there are already `gbv` and `gbV` aliases, so those are out.
* Change implementation of `gCl` alias to use built-in capabilities of
  git, rather than sed.
* Rename gbx and gbX to gbd and gbD respectively
* Mostly revert alias changes
* Add gbr and gbR aliases to gbm and gbM commands
2017-05-01 09:41:17 -07:00
Sudarshan Wadkar f15557159a New `alias gfa=git fetch --all` for git module
Also includes an updated README.md !
2017-04-18 02:44:01 -07:00
François Vantomme fb6f3f7ee9 Feat (aliases): add aliases for git flow 2017-04-13 02:23:05 -07:00
Eduardo San Martin Morote c0049855c5 Added option to skip git aliases definition
Fixes #947
2017-04-04 23:43:46 -07:00
Justin Filip ddfc870f9a Use less destructive git push --force-with-lease. 2017-04-04 22:06:57 -07:00
Wojciech Pietrzak 65b05c0220 Add notice about potential shadowing of the gb command (#1124) 2017-04-04 22:03:47 -07:00
Zhiming Wang 12d48dfcf9 Remove extra use of grep in git-hub-shorten-url (#904) 2017-04-04 21:36:28 -07:00
Sorin Ionescu d43bcb9720 Revert "Remove extra git-dir call in git-info and use git_dir variable instead"
This reverts commit 3012c0984b.
2014-12-08 18:21:00 -05:00
Yegor Pomortsev 3012c0984b Remove extra git-dir call in git-info and use git_dir variable instead 2014-11-12 19:19:19 -05:00
Milan Milanov 17a6124b43 Fix git log pretty format argument 2014-10-18 16:32:49 +02:00
Sorin Ionescu a84ac5b002 Only one newline at end of file 2014-10-09 23:38:15 -04:00
Johannes Doerfert fedad8e9cf Fix git-info added/deleted count formatting typo
Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
2014-03-07 15:52:39 -05:00
Sorin Ionescu 39b88fe334 Remove the git-info SIGINT message
Users should read the Git module README on how to turn git-info on and
off.
2013-05-18 15:31:34 -04:00
Sorin Ionescu a7623aad6b [Fix #307] Do not auto-off git-info
Instead of turning off git-info when CTRL+C is caught, show instructions
on how to turn it off manually.
2013-05-18 15:31:34 -04:00
Sorin Ionescu db384b2ac6 Remove ununsed variable 2013-05-18 15:31:33 -04:00
Sorin Ionescu 7845c36951 Clarify Git listing aliases descriptions 2013-05-18 15:31:33 -04:00
Sorin Ionescu 75c0d49f56 Swap aliases gsd and gsL 2013-05-18 15:31:33 -04:00