anandjagadeesh

To set Upstream of a branch, you can use:

git branch --set-upstream-to origin <branch>

or using the short version

git branch -u origin 

anandjagadeesh

You can view diffs or just filenames of files with conflicts during a pull or merge

To view diffs of files with conflicts, give:

git diff --diff-filter=U

Or if you have difftool set, for example yadt or vimdiff

anandjagadeesh

To change the author of a commit, give

git -c user.name="<authorname>" -c user.email=<author_email> <commithash> --amend --reset-author

anandjagadeesh

To delete any branch, you shouldn't be on that branch, so switch to another branch before giving the commands

To delete any branch run,

git branch --delete <branch_name>
or
git branch -d <branch_name>

But this fails if the branch hasn't been merged, so to force delete, if required, run,

anandjagadeesh

How to configure name, email, etc in Git!

<...> means variable ---> Fill it with appropriate value and [...] means optional

To configure name for a repo: git config user.name "my name"

To configure name globally: git config --global user.name "my name"

To configure email for a repo: git config user.mail "myname@domain.com"