Commit Graph

81 Commits (bf4ddf59513e5cb151a18776bd4575c50e1b8be6)

Author SHA1 Message Date
Ron Green 559cde151b
feat(git): make auto squashing non-interactive 2021-12-22 18:49:39 +02:00
William Richard 2a23598873
Make the regex looking for the main branch match the entire line 2021-11-15 12:19:05 -05:00
William Richard daaab1b73d
Use \s instead of \b
\b matches things like - and _, which is often used in branch names
2021-10-25 11:55:26 -04:00
William Richard 98bd0ae149
Use `/b` to find the default branch, instead of start/end of line 2021-10-25 11:35:19 -04:00
William Richard a14d9cb6ea
Look for branches that are literally the word main
I have a repo with many other branches that contain the string `main`,
but our default branch is still master.  This grep was seeing those other branches
and deciding that my default branch was `main`.  This tighter regex
fixes that behavior for me.
2021-10-22 11:19:21 -04:00
Ron Green d4ebba174c
feat(git): add git unpushed alias (#1897)
* feat(git): add git unpushed alias
2021-06-23 15:02:04 +03:00
Zhengnan Zhao 0f3e4dc8be
Have git check out main branch if present (#1886)
Create function to get default git branch, and use main branch if present
2021-06-23 13:26:48 +03:00
Gurkirat Singh 5c6306deb7
alias (improvement): continue rebase after conflict resolve 2021-03-09 02:24:12 +05:30
ddaza e289549a50
fix alias quotes 2021-02-25 19:45:59 -06:00
Noah Gorny d2ab59fef8 Disable keep-padding option in shfmt
Has some serious bugs and not really needed
Also fixed all files that need to be changed after this
2021-01-21 22:08:45 +02:00
Noah Gorny 610980dd23 git: aliases: Move glsu to glsum in ls-files and add glsut 2021-01-13 21:19:55 +02:00
Gurkirat Singh 957cd578f7 Added git alias to list only conflicted files 2021-01-13 19:08:41 +02:00
Noah Gorny dd4e410a32 aliases: git: Add shellcheck header 2021-01-13 18:24:53 +02:00
Noah Gorny 8723fc56b2 aliases: git: Sort all commands, even miniscule ones 2021-01-13 18:24:16 +02:00
Ron Green 436381de93 refactor(aliases): sort git aliases file and lint it
- move all comments to the same line so they wont be jumbled
- also add to clean_files.txt
2021-01-13 18:24:13 +02:00
Ron Green 4dfd8bcc42
feat(git-aliases): add checkout with username (fixes #1712) (#1732)
* feat(git-aliases): add checkout with username

this can be useful for creating a branch with a common prefix

* fix(git-alais): change quotes
2020-12-13 22:58:01 +02:00
Noah Gorny 18365035a9
Merge pull request #162 from willybarro/449d6d4fe1d969a5d60ae71db1440221304dfa48
Add aliases for GIT-SVN (rebase and dcommit)
2020-12-07 02:00:31 +02:00
Noah Gorny 313abebbb0 git: Add git push --delete alias 2020-10-27 20:06:37 +02:00
Gurkirat Singh fff5439242
added git alias to list remote branch creators with date and time 2020-10-16 02:25:42 +05:30
Noah Gorny d46fc18bd4 alias: git: Add new pretty git log alias (ggf) 2020-10-13 14:41:06 +03:00
Noah Gorny 5dc1c1d589 alias: git: Add git pull / git push --force aliases 2020-10-13 14:37:43 +03:00
Nils Winkler e0dba93561
Merge pull request #1620 from NoahGorny/new-git-aliases
New git rebase + git show aliases
2020-06-19 10:50:28 +02:00
Noah Gorny 7232506dab aliases/git: Add git show alias 2020-06-19 01:52:06 +03:00
Noah Gorny 937094f277 aliases/git: Add git rebase aliases 2020-06-19 01:45:59 +03:00
finn-matti a204f85f41
Add git difftool alias
See #1617
2020-06-17 11:11:52 +03:00
Jeremy Mathevet 91a96a4af2 gh to alias ghm 2020-04-27 11:45:19 +08:00
Jeremy Mathevet f0af4fd601 Check gh command exists before setting git gh alias 2020-04-09 11:06:24 +08:00
David Farrell 7fe7fc020e
aliases/git: Add alises fo git stash push/pop 2020-04-06 10:16:11 -07:00
David Farrell 0274d36cd7
Use long option values 2020-03-25 10:04:27 -07:00
David Farrell 30ae4d9e5f
Add git switch aliases (gsw*) 2020-03-25 09:49:51 -07:00
LeoWW 4933f180f3 add gprom and gpunch 2020-02-17 12:56:12 -08:00
zwfang 35066f91b2 add alias gcamd for `git commit --amend` 2019-10-31 21:56:54 +08:00
NEwa-05 fd1a477716 change git alias following issues #1419 2019-10-11 12:36:49 +00:00
Matthew Adams 7f573f2465 add gcpx 2019-06-26 11:03:12 -05:00
LanikSJ 2704c7e969
Add Git Checkout Pull Branch Alias 2019-04-26 16:15:56 -07:00
zw d9005ae4ac Add alias for git stash pop 2019-04-20 16:54:04 +08:00
Eduardo Bellido Bellido 8e0b486266 New git alias for `git diff --staged` 2019-04-08 12:15:20 +02:00
LanikSJ fae61b3b98
Remove gst Alias 2019-04-02 07:06:03 -07:00
LanikSJ 2cadeaab05
Add Alias for Git Stash 2019-03-28 15:12:03 -07:00
Sangeeth Sudheer 9f37a1a0d0 feat(git.aliases): alias to push current branch w/ tracking 2019-03-21 13:21:09 +05:30
Renan c61d716ee4
add git patch alias 2019-03-14 15:21:55 +01:00
Li Zou 2bc990269a Add alias for listing untracked files 2018-12-22 15:25:08 -08:00
Jason Yu cfab5eeac5
Update git.aliases.bash 2018-05-01 09:53:15 +01:00
Dan Wendorf a35c9473f8 Add git `gh` alias to go "home" (top-level dir) 2017-12-14 10:48:05 -08:00
Jason Yu e5743a299c
Remove duplicating alias
Opps, I overlook the file! XD, sorry.
2017-12-08 09:23:01 +00:00
Jason Yu 62e4108af3
Update git.aliases.bash 2017-12-07 11:07:21 +00:00
Andreas Frömer 3f2edd7ba8 Propose new alias for git branch deletion
This will add two new aliases for `git` to remove a branch.
There is an old alias `gdel` which is not named well because all "branch wise" aliases start with `gb`

So i added two new to delete the branch
`gbd` to remove fully merged branches with upstream
`gbD` to force remove a branch
2017-08-17 09:17:12 +02:00
Álvaro Brey f6629e8343
aliases: git: change 'gw' to 'gwc' to avoid collision with gradle plugin
* 'gw' is currently aliased to 'git whatchanged' but that collides
  with the gradle wrapper plugin, which defines a 'gw' function.
2017-05-22 10:18:15 +02:00
Andreas Frömer f5b83c2d8c Rename git alias to better reflect name convention
This will rename the previous alias `gmv` to `gbm` to better reflect the naming as it will rename the branch not move a file.
Also introduce `gmv` as an alias for `git mv` to move files.
2017-04-11 18:41:13 +02:00
Jeremy Nicklas 2a29f6ba59 simplify git diff alias
Fixes https://github.com/Bash-it/bash-it/issues/921
2017-03-21 06:53:09 -04:00