我有一个克隆的存储库,它现在已经落后于X提交。 git pull
看起来效果很好,压缩,接收等等。但是当我在git status
之后尝试git pull
时,我仍然会留言。可能是造成这个问题的原因是什么?
git status
之后的消息:
On branch release/xxxx
Your branch is behind 'origin/release/xxxx' by 351 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
nothing to commit, working tree clean`
答案 0 :(得分:3)
使用分支名称拉
$ git pull origin release/xxxx
注意:您正在运行 git pull origin / release / xxxx (在 origin 之后为空格而不是'/')
答案 1 :(得分:1)
不是简单地运行 EXEFILE := $(shell basename $(CURDIR))
DIRECTORIES = $(filter-out ./ ./.%, $(shell find ./ -maxdepth 10 -type d))
IFLAGS= -I/usr/include/freetype2
LOCAL_I_DIRS =$(addprefix -I./, $(DIRECTORIES))
LFLAGS= -L/usr/lib/nvidia-375 -L/usr/local/lib -L/usr/include/GL -L/usr/local/include/freetype2 -L/usr/local/lib/
LIBS = -lglfw -lGL -lGLU -lOpenGL -lGLEW -pthread -lfreetype
SRC := $(wildcard *.cpp) $(wildcard **/*.cpp)
$(EXEFILE): $(EXEFILE).cpp
g++ -std=c++11 -o $(EXEFILE) -Wall -Wno-comment $(SRC) $(IFLAGS) $(LOCAL_I_DIRS) $(LFLAGS) $(LIBS)
all: run clean
run: $(EXEFILE)
./$(EXEFILE)
clean:
rm $(EXEFILE)
print-%: ; @echo $* = $($*)
,而是拉一个特定的分支:
git pull