2

我想弄清楚我是否可以拉动。

如果我的分支基于远程分支而不是他有远程跟踪分支，那么我可以拉。

如果我的分支基于commit，它没有远程跟踪分支，因此 pull 会失败。

我设法找到的是使用命令时git branch -vv：

  1. 如果有远程跟踪，它将显示在方括号中。例子：* origin/before-yo b0b97cf [remotes/origin/before-yo] Move to subfolder
  2. 如果分支基于提交，则不会有任何远程 ref 指示。例子：* 2fbe2ab473fe8f7aea2a36642aea1dc7d36add51 2fbe2ab Advance counter

有没有更好的方法来了解是否有一个远程跟踪分支连接到我当前的工作分支？

另外，git branch -vv在某些情况下可能不起作用？

谢谢。

4

1 回答 1

0

这是一个显示您真正想要的脚本：在 之后git fetch，它显示了本地和远程分支之间的区别，因此您将知道您必须做什么（pull、push、rebase等）。将它的目录放在PATH上的某个位置，您可以将其用作git fetch-log.

#!/bin/sh
# git-fetch-log: Ultimate git fetch-log
#
# It shows the diferences of `local...remote` if both side exists and there
# are differences. Useful to find out what you have to do: `merge`, `rebase`,
# `push`, etc. The arguments passed to log.
#
# Place it somewhere on Your `$PATH` and execute by the `git fetch-log`
# command.
#
#                               EXAMPLE OUTPUT
# ============================================================================
#
# ==== branch [behind 1]
#
# > commit 652b883 (origin/branch)
# | Author: BimbaLaszlo <bimbalaszlo@gmail.com>
# | Date:   2016-03-10 09:11:11 +0100
# |
# |     Commit on remote
# |
# o commit 2304667 (branch)
#   Author: BimbaLaszlo <bimbalaszlo@gmail.com>
#   Date:   2015-08-28 13:21:13 +0200
#
#       Commit on local
#
# ==== master [ahead 1]
#
# < commit 280ccf8 (master)
# | Author: BimbaLaszlo <bimbalaszlo@gmail.com>
# | Date:   2016-03-25 21:42:55 +0100
# |
# |     Commit on local
# |
# o commit 2369465 (origin/master, origin/HEAD)
#   Author: BimbaLaszlo <bimbalaszlo@gmail.com>
#   Date:   2016-03-10 09:02:52 +0100
#
#       Commit on remote
#
# ==== test [ahead 1, behind 1]
#
# < commit 83a3161 (test)
# | Author: BimbaLaszlo <bimbalaszlo@gmail.com>
# | Date:   2016-03-25 22:50:00 +0100
# |
# |     Diverged from remote
# |
# | > commit 4aafec7 (origin/test)
# |/  Author: BimbaLaszlo <bimbalaszlo@gmail.com>
# |   Date:   2016-03-14 10:34:28 +0100
# |
# |       Pushed remote
# |
# o commit 0fccef3
#   Author: BimbaLaszlo <bimbalaszlo@gmail.com>
#   Date:   2015-09-03 10:33:39 +0200
#
#       Last common commit

  fmt='ref=%(refname:short); up=%(upstream:short); t=%(upstream:track); ts=%(upstream:trackshort);'
  git for-each-ref --shell --format="$fmt" refs/heads | \
  while read entry; do
    eval "$entry"
    if test "z$ts" != 'z' && test "z$ts" != 'z='; then
      echo -e "\n==== $ref $t\n"
      git --no-pager log --graph --left-right --decorate --abbrev-commit --date-order --boundary $@ $ref...$up
    fi
  done

https://gitlab.com/bimlas/home/blob/3fb207cfe57593a78abe30150a3bc40b242e26a/linux/home/.gitconfig_files/custom_commands/git-fetch-log

于 2018-06-19T05:38:45.130 回答