Try cleaning-up your local repository with: $ git gc –prune=now $ git remote prune origin man git-gc(1): git-gc – Cleanup unnecessary files and optimize the local repository git gc [–aggressive] [–auto] [–quiet] [–prune=<date> | –no-prune] Runs a number of housekeeping tasks within the current repository, such as compressing file revisions (to reduce disk space and … Read more
When it comes to a range of commits, cherry-picking is was not practical. As mentioned below by Keith Kim, Git 1.7.2+ introduced the ability to cherry-pick a range of commits (but you still need to be aware of the consequence of cherry-picking for future merge) git cherry-pick” learned to pick a range of commits (e.g. … Read more
As it turns out, Git is smart enough not to drop a stash if it doesn’t apply cleanly. I was able to get to the desired state with the following steps: To unstage the merge conflicts: git reset HEAD . (note the trailing dot) To save the conflicted merge (just in case): git stash To … Read more
Since Git1.6.3, you can use the git difftool script: see my answer below. May be this article will help you. Here are the best parts: There are two different ways to specify an external diff tool. The first is the method you used, by setting the GIT_EXTERNAL_DIFF variable. However, the variable is supposed to point … Read more
below is used to add a new remote: git remote add origin git@github.com:User/UserRepo.git below is used to change the url of an existing remote repository: git remote set-url origin git@github.com:User/UserRepo.git below will push your code to the master branch of the remote repository defined with origin and -u let you point your current local branch … Read more
Ideally your .gitignore should prevent the untracked (and ignored) files from being shown in status, added using git add etc. So I would ask you to correct your .gitignore You can do git add -u so that it will stage the modified and deleted files. You can also do git commit -a to commit only … Read more
git stash drop takes no parameter – which drops the top stash – or a stash reference which looks like: stash@{n} which n nominates which stash to drop. You can’t pass a commit id to git stash drop. git stash drop # drop top hash, stash@{0} git stash drop stash@{n} # drop specific stash – … Read more
The other answers suggesting checking out the other branch, then committing to it, only work if the checkout is possible given the local modifications. If not, you’re in the most common use case for git stash: git stash git checkout other-branch git stash pop The first stash hides away your changes (basically making a temporary … Read more
You might be needing a cleanup: git gc –prune=now or you might be needing a prune: git remote prune public prune Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in “remotes/<name>”. With –dry-run option, report what branches … Read more
git tag should be enough. See git tag man page You also have: git tag -l <pattern> List tags with names that match the given pattern (or all if no pattern is given). Typing “git tag” without arguments, also lists all tags. More recently (“How to sort git tags?”, for Git 2.0+) git tag –sort=<type> … Read more