git - 合并 HEAD 到 master

Question

我在执行 git merge master 时将 HEAD 合并到 master 时遇到问题 - 我得到“已经更新” 请帮助，谢谢

* 0b3b69b - (35 минут назад) chart on exchange page - Little Whale (HEAD)
* 8f52f4b - (6 часов назад) exchange modul works correctly - Little Whale
* a6c836e - (2 дня назад) commit for checkout on other commit - Little Whale (master)
* 9e59520 - (2 дня назад) pie chart renders correctly - Little Whale
* f57ace2 - (2 дня назад) input group in portfolio page are fixed and works correctly - Little Whale
* 3a45fc1 - (3 дня назад) exchange block implemented - Little Whale
* 75f7ca9 - (4 дня назад) portfolio was done - Little Whale
* 5ea03ec - (5 дней назад) currency block and pie chart implemented - Little Whale
* 8913e2c - (5 дней назад) Initialize project using Create React App - Little Whale

标签： gitmergegit-merge

Answer 1

要扩展eftshift0的评论，要使用的完整命令是：

git log --decorate --online --graph --all --branches

然后，您将能够看到 HEAD 相对于 的位置master。

正如LeGEC评论的那样，一个更集中的命令将是：

git log --decorate --online --graph HEAD master