If you know the ref, then git show <MERGE_COMMIT> will show you the resolution done (if any) for the merge commit. For log, use git log -p -c or git log -p –cc. From the manpage of git log: -c With this option, diff output for a merge commit shows the differences from each of … Read more
“C:\Program Files (x86)\Git\bin\sh.exe” –login -i -c “git archive master | tar -x -C $0” “%~1”
As I explain in this answer to Delete or remove all history, commits, and branches from a remote Git repo?, you can also achieve the same thing as Ceilingfish’s answer (i.e. delete all references/branches/tags in the remote repo) by doing the following: Create new empty repo with initial commit: mkdir new cd new echo “This … Read more
git version 1.8.4 added an –author-date-order argument to git log; according to the release notes, “the output is topologically sorted and commits in parallel histories are shown intermixed together based on the author timestamp.”
These two files contains absolute submodule path: {submodule}/.git .git/modules/{submodule}/config So, if you moved the repo, the absolute path in these two files are not valid, and cause the ‘not a git repository’ error. Just fix these files manually.
i got this message because of cloning the svn repo with –no-metadata option. Maybe that’s the case with Your problem too. When cloning it without that option everything is fine. The –no-metadata option is meant to clone an SVN repository when the new git clone is to be come the canonical source in the future. … Read more
You can wget your way out of the GitHub repo to get a tar file (archive): wget –no-check-certificate https://github.com/User/repo/archive/master.tar.gz # better, if the certificate authorities are present: wget https://github.com/User/repo/archive/master.tar.gz will get you a file named ‘master’ from the user ‘User”s repo ‘repo’. The updated V3 API url is: https://api.github.com/repos/User/repo/:archive_format/:ref # # two possibilities for fomat: … Read more
Just add on the –prune-empty option: git filter-branch –tree-filter ‘rm -rf my_folder’ –prune-empty -f HEAD (And of course, if you have other refs, you might want to rewrite everything with — –all instead of just HEAD.) Note that this isn’t compatible with –commit-filter; in that case, Charles Bailey has your answer.
Make sure that your Rails app is in the root of the repo, the Gemfile is present and properly named. It is basically not able to detect your code base as one of the supported project types and hence failing it. Also, even if you do have a proper project, make sure it is part … Read more