branch

Git主要流程 一、创建仓库 # 在当前目录初始化一个Git代码库 $ git init # 新建一个目录，将其初始化为Git代码库 $ git init [project-name] # 下载一个项目和它的整个代码历史 $ git clone [url] 二、配置 Git的配置文件为.gitconfig,它可以在用户的主目录下(全局配置)，也可以在项目目录下(项目配置)。 # 显示当前的Git配置 $ git config --list # 编辑Git配置文件 $ git config -e [--global] # 设置提交代码时的用户信息(全局) $ git config --global user.name "[name]" $ git config --global user.email "[email address]" 三、代码提交 将代码提交到Git仓库的过程中，经历了以下区域：workspace(工作空间)->index(暂存区)->Repository(本地仓库)->Remote(远程仓库) 提交到暂存区 # 添加指定文件到暂存区 $ git add [file1] [file2] ... # 添加指定目录到暂存区，包括子目录 $ git add [dir] # 添加当前目录的所有文件到暂存区 $ git add . # 添加所有目录的中的已修改文件到暂存区 $

I forked a repository on github. I made some changes and did a pull request. Now I made some other changes and want to do a new pull request, but on the preview screen before doing the pull request it shows the old commits too (the ones that were already accepted). How do I select only the latest commit in the master branch of my forked repository so that I can do a pull request with only that commit? This answer from a coworker fixed my problem: git checkout -b NEW_BRANCH_NAME LAST_COMMIT_NAME_BEFORE_THE_ONE_WANTED git cherry-pick COMMIT_NAME_WANTED git push origin NEW_BRANCH_NAME Then on

I'm trying to help out a coworker who accidentally created one feature branch from another feature branch, rather than creating the second one from master. Here is essentially what we have now… Master ---A---B---C \ Foo E---F---F---H \ Bar J---K---L---M And here is what we'd like to have… Master ---A---B---C |\ Foo | E---F---F---H | Bar J---K---L---M One way I thought of would be to create FooV2 and BarV2 branches, and cherry-pick the individual commits into the appropriate V2 branches. But I'm curious, is there a better way to handle this situation? It looks to me like you could: git checkout

how do I push a commit in two branches? I can't use "git push", because then it pushes to three branches, and i just want the commit in two of them.. Ive tried a "git merge HEAD --commit id from branch A--" in branch B, but then it takes everything from branch A and merges with branch B. I just want the last commit and not everything else merged with branch B. Anyone know what to do? Short answer You can apply already existing commit to another branch using cherry-pick command, and then push both branches using git push origin branchA branchB . Why pushing a commit in two branches might be

I don't understand the second line in the output to git branch -l -a : remotes/origin/HEAD -> origin/master . git branch -l -a * master remotes/origin/HEAD -> origin/master remotes/origin/master Is that a leftover from another operation? Should I clean it up? And how would I do that? Usually I work with git on the cli, but on this local repository I experimented with TortoiseGit to find an easy git workflow for a friend. No, no need to clean up: it is the symbolic branch referenced by your remote repo. When you clone your repo, you will be by default on the branch referenced by remotes/origin

How do I copy all files in a directory from another branch? I can list all of the files in that directory by doing git ls-tree master:dirname I can then copy all of the files individually by doing git checkout master -- dirname/filename However, using wildcards has so far been a total fail. This does nothing: git checkout master -- dirname/*.png Though I guess I can use a bash script to do that, there has to be an easier way, right? As you are not trying to move the files around in the tree, you should be able to just checkout the directory: git checkout master -- dirname test30 If there are