checked out (that is, your HEAD is pointing to it): $ vim index.html $ git commit -a -m 'Create new footer [issue 53]' Figure 20. The iss53 branch has moved forward with your work Now you get the call that Switched to branch "iss53" $ vim index.html $ git commit -a -m 'Finish the new footer [issue 53]' [iss53 ad82d7a] Finish the new footer [issue 53] 1 file changed, 1 insertion(+) Figure 23. Work continues on that looks something like this: <<<<<<< HEAD:index.html ======= >>>>>>> iss53:index

checked out (that is, your HEAD is pointing to it): $ vim index.html $ git commit -a -m 'Create new footer [issue 53]' 71 Figure 20. The iss53 branch has moved forward with your work Now you get the call Switched to branch "iss53" $ vim index.html $ git commit -a -m 'Finish the new footer [issue 53]' [iss53 ad82d7a] Finish the new footer [issue 53] 1 file changed, 1 insertion(+) 74 Figure 23. Work continues that looks something like this: <<<<<<< HEAD:index.html ======= >>>>>>> iss53:index

checked out (that is, your HEAD is pointing to it): $ vim index.html $ git commit -a -m 'Create new footer [issue 53]' Figure 20. The iss53 branch has moved forward with your work Now you get the call that Switched to branch "iss53" $ vim index.html $ git commit -a -m 'Finish the new footer [issue 53]' [iss53 ad82d7a] Finish the new footer [issue 53] 1 file changed, 1 insertion(+) Figure 23. Work continues on that looks something like this: <<<<<<< HEAD:index.html ======= >>>>>>> iss53:index

X-Real-IP 将真实的客 户端 IP 地址传递给 Gitea。否则 Gitea 程序会将客户端地址错误解析为反向代理服务器的地址，例如回环地址 127.0.0.1 。 1. proxy_set_header X-Real-IP $remote_addr; 额外注意，在 Gitea 的配置文件 app.ini 中存在下列默认值： 1. REVERSE_PROXY_LIMIT = 1 2. proxy_set_header Host $host; 8. proxy_set_header X-Real-IP $remote_addr; 9. proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; 10. proxy_set_header X-Forwarded-Proto proxy_set_header Host $host; 10. proxy_set_header X-Real-IP $remote_addr; 11. proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; 12. proxy_set_header X-Forwarded-Proto

分支在不断的向前推进，因为你已经检出 到该分支 （也就是说，你的 HEAD 指针指向了 iss53 分支） $ vim index.html $ git commit -a -m 'added a new footer [issue 53]' 图表 20. iss53 分支随着工作的进展向前推进 现在你接到那个电话，有个紧急问题等待你来解决。 有了 Git 的帮助，你不必把这个紧急问题和 iss53 的修改 to branch "iss53" $ vim index.html $ git commit -a -m 'finished the new footer [issue 53]' [iss53 ad82d7a] finished the new footer [issue 53] 1 file changed, 1 insertion(+) 图表 23. 继续在 iss53 分支上的工作 你在 出现冲突的文件会包含一些特殊区段，看 起来像下面这个样子： <<<<<<< HEAD:index.html ======= >>>>>>> iss53:index

不断的向前推进，因为你已经检出到该分支 （也就是说，你的 HEAD 指针指向 了 iss53 分支） $ vim index.html $ git commit -a -m 'added a new footer [issue 53]' 图表 20. iss53 分支随着工作的进展向前推进 现在你接到那个电话，有个紧急问题等待你来解决。 有了 Git 的帮助，你不必 把这个紧急问题和 iss53 的修改混在一起， to branch "iss53" $ vim index.html $ git commit -a -m 'finished the new footer [issue 53]' [iss53 ad82d7a] finished the new footer [issue 53] 1 file changed, 1 insertion(+) 图表 23. 继续在 iss53 分支上的工作 你在 出现冲突的文件会包含一些特殊区段，看起来像下 面这个样子： <<<<<<< HEAD:index.html ======= >>>>>>> iss53:index