If you forget the hash, you can find it via git reflog. You can then recover the branch via: git checkout -b mywork 123abc0 Note that when you delete your branch, it will give you the SHA-1 hash for its tip: Deleted branch mywork (was 123abc0 ). It's best to redo the steps later, (The repo is updated every 3 minutes) but you can also instruct git to force-delete your branch. NOTE: If you haven't waited long enough after your commit, it is possible that 'git fetch' did not get your commit and git will continue to believe that you have local changes, which will prevent "git branch -d" from succeeding. Git branch -d mywork # will only work if has been merged If there are no differences, delete the branch: git checkout origin /master Git diff -stat origin /master # optional check To check that the branch has been committed upstream: git checkout mywork This may be more trouble than it's worth, but it's the safest way. You can avoid this by squashing your local revisions into a single revision (see 6.4 Git Tools - Rewriting History, or more simply squashing commits with rebase). So make sure master is up-to-date, rebase branch, and then try deleting (optionally check manually before).īeware that if your local branch has many revisions (instead of always amending a single revision), rebasing to master may fail, since it will try to apply the patches incrementally. If not, it will refuse to force deletion, use git branch -D. Simply, if master (remote or local) is up-to-date and your branch has been rebased, git branch -d will delete the branch. Otherwise, you'll need to dig through the git repository, so be careful. so as long as your CL has been posted, you can easily recover your work.
#Git create branch from stash Patch
Git cl patch https : ///download/issue12345_1.diff # Use URL of raw patch for older patch sets
Git cl patch 12345 # Using CL issue number, not bug number, applies latest patch set Remember that you can always apply a CL that has been posted via: git checkout -b myworkfrompatch
0 kommentar(er)
