#git diff

Easily create and apply a git patch for your Drupal website with this brief guide on the most popular Git commands.

https://www.specbee.com/blogs/how-create-and-apply-patch-git-diff-and-git-apply-commands-your-drupal-website

In the past months I've been silently updating my old post Git not-so-used commands. Today I am adding a new trick I learnt this week (ht ozke) to make same changes to be applied to different files much easier.

Change whatever you need to change in one of the files.

For instance we modify forms/a.js and commit changes.

Create the patch file using git diff

git diff from-commit to-commit > forms.diff

If we modified several files and we just want the diff for one of them we can add the option as in:

git diff from-commit to-commit file.ext > forms.diff

Use the following linux command to apply the patch to the other file:

How does “index f2e4113..d4b9bfc 100644” in git diff correspond to SHA1 ID in gitk?

What does ‘index f2e4113..d4b9bfc 100644′ mean in the output from git diff? Till now I have assumed that these SHA1 ID’s are from_version..to_version, but I can’t find them in gitk.

$ git --version git version 1.8.3.4 $ git diff ae1fdc1 diff --git a/README b/README index f2e4113..d4b9bfc 100644 --- a/README +++ b/README @@ -1 +1,3 @@ stuff +more +more stuff

‘index f2e4113..d4b9bfc 100644′…

몇 가지 git 사용 팁을 링크로 공유합니다.

git diff에서 변경된 부분을 더 명확하게 보는 방법

Windows에서 git 사용에 관한 각종팁

git diff한 것을 patch하기

Say you want to send a friend a patch, or perhaps you often apply a change back and forth (say like preparing a file for production, and getting it back to testing). In our case base.html uses less.js to render the CSS during development, but in production it calls instead a minified CSS. So to convert base.html between the production and dev versions we created a patch. This is how you do it:

1. Modify the file

git diff dir/thefile.html --no-prefix > patch_thefile_from_dev2prod

    The next time you need to change the file from dev to prod you simply apply the patch:

Joel: What

Joel: What was I doing

Joel: *runs git diff to see what he's been doing*

Anna: git diff says head-hug receiving >

git diff implicitly creates a patch, but the default is to patch from tracked changes to index, so that a naked

git diff

doesn't show the changes you've made but added to the index, for example if you just added a new file. In order to do that, you can run