howto:git
Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revisionLast revisionBoth sides next revision | ||
howto:git [2021/12/26 12:13] – va7fi | howto:git [2021/12/26 12:24] – [Test Scenarios] va7fi | ||
---|---|---|---|
Line 5: | Line 5: | ||
* When pushing local changes to remote, the remote master can't be checkout out. | * When pushing local changes to remote, the remote master can't be checkout out. | ||
+ | References: | ||
+ | * [[https:// | ||
+ | * Using [[https:// | ||
+ | | ||
==== Initial Cloning ==== | ==== Initial Cloning ==== | ||
* Create two files in a '' | * Create two files in a '' | ||
Line 193: | Line 196: | ||
-rwxrwx--- 1 ptruchon www-data 26 Dec 26 10:20 file2.txt | -rwxrwx--- 1 ptruchon www-data 26 Dec 26 10:20 file2.txt | ||
</ | </ | ||
+ | |||
+ | ==== www-data: | ||
+ | Sometimes Dokuwiki saves new files with the '' | ||
+ | |||
+ | * Change ownership of '' | ||
+ | ~/ | ||
+ | ls -l | ||
+ | total 24 | ||
+ | -rwxrwxr-x 1 ptruchon www-data 50 Dec 26 12:01 file1.txt | ||
+ | -rwxrwx--- 1 www-data www-data 26 Dec 26 10:20 file2.txt | ||
+ | </ | ||
+ | |||
+ | * Edit '' | ||
+ | ~/ | ||
+ | git commit -m ' | ||
+ | [master b7c9353] edited file2.txt on local | ||
+ | 1 file changed, 1 insertion(+) | ||
+ | |||
+ | git status | ||
+ | On branch master | ||
+ | Your branch is ahead of ' | ||
+ | (use "git push" to publish your local commits) | ||
+ | |||
+ | nothing to commit, working tree clean | ||
+ | |||
+ | git log | ||
+ | commit b7c93538a15efe16ac60956ce3f77526ce43ec1d (HEAD -> master) | ||
+ | Author: Patrick Truchon < | ||
+ | Date: Sun Dec 26 12:22:38 2021 -0800 | ||
+ | |||
+ | edited file2.txt on local | ||
+ | |||
+ | commit b7d91058fed9fe64c96525a3d0bef56c682ade68 (origin/ | ||
+ | Author: Patrick Truchon < | ||
+ | Date: Sun Dec 26 10:45:41 2021 -0800 | ||
+ | |||
+ | changed file1.txt from local | ||
+ | |||
+ | commit 0e5ccdedd1c9188996aadad3a8e2be5a319ab789 | ||
+ | Author: Patrick Truchon < | ||
+ | Date: Sun Dec 26 10:21:24 2021 -0800 | ||
+ | |||
+ | initial commit on remote | ||
+ | </ | ||
+ | |||
+ |
howto/git.txt · Last modified: 2021/12/26 12:26 by va7fi