Git branches do not have “heads” in the Mercurial sense. There is only one thing called HEAD, and it’s effectively a symlink to the commit you currently have checked out. In the case of hosted repositories like GitHub, there is no commit checked out—there’s just the repository history itself. (Called a “bare” repo.) The reason … Read more
Actualy, there’s a really cool command I learned recently that will do exactly what you want: git commit-tree -p HEAD^2 -p HEAD^1 -m “Commit message” “HEAD^{tree}” This will create a new commit based on what is currently HEAD, but pretend that it’s parents were HEAD^2,HEAD^1 (note this is the reversed order). git-commit-tree prints the new … Read more
What went wrong Where you went wrong is doing the $ git add . That adds everything, so also foo/bar, to the index of the current repository (ready to be committed thus). Correct way If you just don’t do that and continue with $ git submodule add https://github.com/CarloWood/XYZ.git foo/bar then that should work; this would … Read more
Either one or more files are being modified during your operation, or something is causing inconsistent reads (e.g. failing hardware). Short version: Git’s developers did not intend for it to be used on volatile files. Due to the layout* that Git uses for “loose objects” and the limited filesystem semantics that it assumes**, Git must … Read more
If you want a dynamic index that doesn’t require any updating the only method I’ve found is by generating it client side with the github contents api. Here is a simple example that creates links to files in the top level directory of your project. If you want to support subdirectories using this method you … Read more
It seems that the git-completion.zsh is not designed to be sourceed. You could copy the git-completion.zsh file to somewhere in the $fpath and rename it to _git instead. For example: (if you decide to have ~/.zsh/functions/_git.) First, you could copy the git-completion.zsh to there and rename it to _git. % mkdir -p ~/.zsh/functions && cp … Read more
Edit 2020-01-23: Searched quickly and FYI saw that there’s another plugin that seems more VCS agnostic: https://github.com/mhinz/vim-signify There’s a new plugin that does this: vim-gitgutter. It puts the changes in the Vim gutter whenever you save the file. Here’s what it looks like in action:
cherry-pick effectively applies the changes from commit A onto the working tree and makes a commit. This means if you get any conflicts during cherry-picking you need to commit after resolving them to finish the cherry-pick. EDIT Edward noted that this is only true when you are cherry-picking a single commit. When picking multiple commits … Read more
I think you want to: git fetch –all -Pp where: git fetch Download objects and refs from another (remote) repository –all fetch all remotes. -P remove any remote-tracking references that no longer exist on the remote. -p remove any local tags that no longer exist on the remote. for more use git fetch –help We … Read more
I just started getting this as well. Something surely changed in the default settings with a recent update. The solution seems to be to turn off this setting git.useEditorAsCommitInput To change this, go to: File > Preferences > Settings > search “git.useEditorAsCommitInput” then untick