git-branch

is it possible with Git's tools to move files into a new folder while modifying its full history, as if the files had been there from their first add? I came up on this after merging some repos together: I moved the files from several repos to distinct folders inside one "super" repo, however the merged history behaves very bad with git rebase and git svn tools as totally different files may collide at their old locations of course. So now this got the job done: git filter-branch --tree-filter '(ls -A; mkdir TheSubdir; echo TheSubdir) | xargs mv' Strange but nice: the .git dir stays where it

I'm looking for what I hope is the simple one line command to determine the the correct upstream ref for the currently checked out branch? Essentially something like git branch --remote HEAD which (if it worked) would convert the symbolic pattern HEAD to the current branch name, and then the option --remote then changes it to the ref of the remote-tracking branch. (But it doesn't do that!) If I have branch morehelp with a config of remote = origin merge = refs/heads/morehelp The simple command line would return refs/remotes/origin/morehelp which is it's upstream tracking branch (ideal for the

I have a branch named 0726b and I want to diff my current working copy with that branch. Apparently there is also a commit that has a hash starting with that very sequence, because I get $ git diff 0726b warning: refname '0726b' is ambiguous. How do I tell git that it should take the argument as a branch name? Try this: git diff refs/heads/0726b refs/heads/0726b specifies a branch named 0726b . The file ./git/refs/heads/0726b contains the commit hash that this branch points to. 来源： https://stackoverflow.com/questions/51534635/how-to-resolve-ambiguity-between-branch-name-and-commit-hash-in-git

To delete a local branch in git I use git branch -d , but how do I safely remove a remote branch? I would like to delete it only when the remote branch is merged to my current branch . eckes The answer is partly covered here: How can I know in git if a branch has been already merged into master? While that post copes with local branches, you could find remote branches that are merged or not using git branch -r --merged to detect all remote branches that are already merged into the current git branch -r --unmerged to do the opposite git branch -r --no-merged is correct for the new version of

when I delete files from one branch it deletes from all branches. what can I do? when deleting a file with git and persisting that project state ( git commit ) it will only be deleted in that commit and its children (speaking: in that branch). when merging that branch into another branch it might well be possible, that the file is going to be deleted (unless changed in the other branch). when deleting a file, not committing it and then switching branches, git will apply your current set of changes to the other branch, in your case deleting the file there too. committing the delete should avoid

We have a remote git repository where there are no size restrictions for files and we had pushed a 300MB into it. We then realized it and then removed the file from the repository. Meanwhile the same repository was added to github and when we try to push the changes to github, we get the large file size error. remote: error: File dir/filename is 312.27 MB; this exceeds GitHub's file size limit of 100 MB To fix this, I tried using the interactive git rebase solution suggested at How to remove/delete a large file from commit history in Git repository? , but at the end of the rebase operation I