Category: git

git diff <old-commit-hash> <new-commit-hash> ':(exclude)*.mdx' > diff.txt Example git diff 0022768e94766161a0c960e216e4afa26e34d66d 53b20cab480e20b4f6cad2e4795d36166eb6bf19 ':(exclude)*.mdx' > diff.txt

error: Merging is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm ' hint: as appropriate to mark resolution and make a commit....

Pull is not possible because you have unmerged files. Please, fix them up in the work tree, and then use 'git add/rm <file>' as appropriate to mark resolution, or use 'git commit -a'. Solution...

CONFLICT (submodule): Merge conflict in orthrus/external [dev@baobab vf]$ git checkout -b KRAK-1541-cleanup vfcore/orthrus/external: needs merge vfcore/vfcommonlib: needs merge error: you need to resolve your current index first [dev@baobab vf]$ git status # On branch...

$> git remote prune origin This will cleanup local branches. You may also want to cleanup and compact your repo WARNING: This may temporarily use twice as disk space so do not use if...

Method #1   Commit your changes but do not push yet git format-patch -n HEAD^ Then go in each submodule you care and do the sam Method #2 Submodules git submodule --quiet foreach --recursive...

$> git clone <http://provider.com/coolrepo.git> $> cd coolrepo $> git fetch <http://provider.com/repowithvaluablechanges.git> You can now use the SHA1 from the other repo with valuable changes even if they are unrelated! $> git format-patch -k -1...

1) Grab the commit hash where it got deleted 2) Type this command where "theFolderImissSoMuch" is the folder to restore. $> git checkout 1d4b99fe3e312e4cb26b5e484d00cdcbc199e7cb^ -- theFolderImissSoMuch  

Just copy the .git folder and then do checkout -- * $> mkdir my-new-repo $> cd my-new-repo $> cp -R ../old-repo/.git ./ $> git checkout -- *

[dev@black vf-6.4]$ git commit -m "VF-8864 * copyright year to 2015" error: Error building trees Solution $> git reset --mixed