技术控

    今日:0| 主题:63445
收藏本版 (1)
最新软件应用技术尽在掌握

[其他] Lesser known Git commands

[复制链接]
美麗的邂逅∮ 发表于 2016-9-30 22:34:30
385 9
Git has a strong commitment to backwards compatibility: many powerful features are hidden behind options rather than exposed as default behaviour. Fortunately Git also supports aliases , so you can create your own commands that do all manner of Git magic. Here’s a selection of the more useful (or at least entertaining) aliases defined in my  .gitconfig :
  git please

  1. $ git config --global alias.please 'push --force-with-lease'
复制代码
  Every developer has had the chat with their team lead about force pushing to a shared branch (i.e. don’t do it). Rebasing, amending, and squashing. are all good fun right up until you rewrite some shared history and spill duplicate commits all over your repository. Fortunately, Git won’t let you rewrite history on the server willy-nilly. You have to explicitly pass the --force option to git push to show you mean business. But force pushing is a bit heavy handed: it stomps the upstream branch with your local version, and any changes that you hadn’t already fetched are erased from history.
         

Lesser known Git commands

Lesser known Git commands
          Quality meme courtesy of    @tarkasteve        Git’s  --force-with-lease   option is far more polite: it checks that your local copy of the ref that you’re overwriting is up-to-date before overwriting it. This indicates that you’ve at least fetched the changes you’re about to stomp. Since git push --force-with-lease is rather a lot to type out each time, I’ve created a polite alias for it: git please
  git commend

  1. $ git config --global alias.commend 'commit --amend --no-edit'
复制代码
  Ever commit and then immediately realize you’d forgotten to stage a file? Fret no more! git commend quietly tacks any staged files onto the last commit you created, re-using your existing commit message. So as long as you haven’t pushed yet, no-one will be the wiser.
  1. $ git add Dockerfile$ git commit -m ‘Update Bitbucket pipeline with new Docker image’# (facepalm)$ git add bitbucket-pipelines.yml$ git commend
复制代码
git it

  1. $ git config --global alias.it \'!git init && git commit -m “root” --allow-empty'
复制代码
  The first commit of a repository can not be rebased like regular commits, so it’s good practice to create an empty commit as your repository root. git it both initializes your repository and creates an empty root commit in one quick step. Next time you spin up a project, don’t just add it to version control: git it !
  1. $ cd shiny-new-thing$ git itInitialized empty Git repository in /shiny-new-thing/.git/[master (root-commit) efc9119] root
复制代码
git staaash

  1. $ git config --global alias.stsh 'stash --keep-index'$ git config --global alias.staash 'stash --include-untracked'$ git config --global alias.staaash 'stash --all'
复制代码
   git stash   is one of the most delightful and useful Git commands. It takes any changes to tracked files in your work tree and stashes them away for later use, leaving you with a clean work tree to start hacking on something else. However if you’ve created any new files and haven’t yet staged them, git stash won’t touch them by default, leaving you with a dirty work tree. Similarly, the contents of untracked or ignored files are not stashed by default.
   I’ve created a few handy aliases to handle different variations of git stash , based on which bits of your work tree you need to stash:
  1. git stsh      # stash only unstaged changes to tracked filesgit stash     # stash any changes to tracked filesgit staash    # stash untracked and tracked filesgit staaash   # stash ignored, untracked, and tracked files
复制代码
  If in doubt, the long one ( git staaash ) will always restore your worktree to what looks like a fresh clone of your repository.
  git shorty

  1. $ git config --global alias.shorty 'status --short --branch'
复制代码
  I run  git status  probably more than any other Git command. Git’s inline help has gotten a lot more friendly over the years, which is excellent for beginners, but the output is overly verbose for those more familiar with Git. For example, git status emits 18 lines to tell me that I have a couple of staged, unstaged, and untracked changes:
  1. $ git statusOn branch masterChanges to be committed:  (use “git reset HEAD <file>…” to unstage)
复制代码
  1. modified: package.json
复制代码
  1. $ git config --global alias.commend 'commit --amend --no-edit'0
复制代码
  1. modified: package.json
复制代码
  1. $ git config --global alias.commend 'commit --amend --no-edit'2
复制代码
  1. $ git config --global alias.commend 'commit --amend --no-edit'3
复制代码
  git shorty tells me the same thing in 3 lines:
  1. $ git config --global alias.commend 'commit --amend --no-edit'4
复制代码
  (OK, so I actually have this aliased as git st for brevity, but I couldn’t resist.)
  git merc

  1. $ git config --global alias.commend 'commit --amend --no-edit'5
复制代码
  If you’re using a standard non-rebasing branching workflow, running a standard git merge to combine feature branches with master is actually not ideal. With no options, git merge uses the --ff merge strategy, which will only create a merge commit if there are no new changes on the master branch, otherwise it simply “fast forwards” your master branch to point at the latest commit on your feature branch. Only sometimes creating a merge commit makes it tricky to reason about which code was developed on which branches when looking through your git history.
         

Lesser known Git commands

Lesser known Git commands
        git merc uses the --no-ff strategy, to always create a merge commit.
         

Lesser known Git commands

Lesser known Git commands
        Incidentally, --no-ff is also what we use under the hood (by default) when merging pull requests in Bitbucket .
  git grog

  1. $ git config --global alias.commend 'commit --amend --no-edit'6
复制代码
  My git grog (or “ gr aphical l og ”) alias has evolved over the years to the point where I’m no longer sure I understand exactly what it does. But it sure looks pretty:
         

Lesser known Git commands

Lesser known Git commands
          git grog        Here’s the standard git log for comparison:
         

Lesser known Git commands

Lesser known Git commands
         git log       There are all sorts of pretty formats available, so fork the command above and make it your own!
  For the GUI fans

   If you’re a Git GUI fan and using Mac or Windows, you might be using our free Git client: Atlassian SourceTree . If so, you can take advantage of these aliases by creating a new custom action — and optional keyboard shortcut — in your SourceTree preferences:
         

Lesser known Git commands

Lesser known Git commands
        Then you can access it via the Actions -> Custom Actions menu, or your choice of keyboard shortcut:
         

Lesser known Git commands

Lesser known Git commands
        Happy aliasing! If you have some neat Git aliases of your own, share them in the comments, or tweet me @kannonboy .
asdafafaf 发表于 2016-10-1 07:02:56
美麗的邂逅∮很有经验啊!
回复 支持 反对

使用道具 举报

柒年 发表于 2016-10-1 17:00:04
我也来顶一下..
回复 支持 反对

使用道具 举报

夏恋蜜语丶 发表于 2016-10-1 17:40:12
帮顶,帮顶,快速顶贴中・・・・・・
回复 支持 反对

使用道具 举报

rtooj 发表于 2016-10-2 00:18:27
我消极对待减肥,能不能取消我胖子的资格啊
回复 支持 反对

使用道具 举报

kfaqk 发表于 2016-10-4 03:19:10
在乎的人不明白,明白的人不在乎。
回复 支持 反对

使用道具 举报

李志高 发表于 2016-10-10 11:30:17
楼主你想太多了!
回复 支持 反对

使用道具 举报

熙雯 发表于 2016-10-14 12:36:33
各位兄台,通融通融,沙发我来啦!
回复 支持 反对

使用道具 举报

Bean 发表于 2016-11-8 09:54:56
打酱油的人拉,回复下赚取积分
回复 支持 反对

使用道具 举报

刘甜甜 发表于 2016-11-11 10:00:59
如果恐龙是人,那刘甜甜是什么?  
回复 支持 反对

使用道具 举报

我要投稿

推荐阅读


回页顶回复上一篇下一篇回列表
手机版/c.CoLaBug.com ( 粤ICP备05003221号 | 粤公网安备 44010402000842号 )

© 2001-2017 Comsenz Inc.

返回顶部 返回列表