----- Original Message ----- From: Valerio Pachera To: git-users@googlegroups.com Sent: Sunday, January 12, 2014 5:48 PM Subject: [git-users] The right process of generating and merging patches?
Hi all, this is my first topic in this group. I'm not professional programmer, I mostly write scripts. I'm interested in git because I'm collaborating with an open source project writing documentation. So I wish to get familiar with git work-flow process to send patches. I'll probably use it also in the next future for my scripts. Here's my first question about patch generation and merge: I have just a single file named "doc.txt" in the directory "doc" I run cd doc git init git add doc.txt git commit -m 'first commit' I clone the repository cd .. git clone doc doc_clone cd doc <I edit the first line changing some stuff> git add doc.txt git commit -m 'changed first line' git format patch -1 cd ../doc_clone git apply ../doc/0001-changed-first-line.patch I see the patch ha been applied but when I run 'git log' I don't see any new commit. I was expecting that, applying a patch, would automatically generate a commit. Guessing that I'm the maintainer of the project, what would it be the right process for merging single patch or a series of patches? The 'git apply' should be thought of as just being like 'git add'. You may have other local changes to be done before you nake a commit, so your missing step is to do a 'git commit' to recored those changes. The 'git apply' man page's synopsis https://www.kernel.org/pub/software/scm/git/docs/git-apply.html, also notes - Apply a patch to files and/or to the index so you also get to choose if the patch changes should even be implicitly 'added'! Philip -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
