the stage.2.2 then execute git rebase-continue to directly create another patch.Repeat 2.1, 2.2 Until rebase is complete. Note that the rebase does not need to explicitly execute commit. Commit is automatically completed by git.3. You can use git diff to view conflicts. Git diff has different meanings in different scenarios.
Git pull:
It is equivalent to git fetch + git merge. If git merge is a quick merge, a commit point is formed.The commit point corresponding to git merge can be referred to
.; Git add-u;Git add-a4. Submission:(1) From staging area I to local warehouse Lgit commit-m [Submit message](2)5. Revocation(1) From staging area I to work area Wgit rm--cached (2) Revert to head versiongit reset--hard HEAD(3) Modify the submitted user name informationgit commit--amend--author= "author Name 6. Remote(1) Change the remote warehouse addressgit remote Set-url origin http://xxx.xx.com/x.git(2) View Remote warehouse logsgit log origin/master(3) Compare local and remote branchesgit d
demand, suddenly this self-happy development way is interrupted, a test branch has a bug needs to be repaired immediately, wipe, the local code has not been submitted, but do not want to because of the temporary submission of local code to describe how the temporary submission of the description. You can then use Git stash to access locally changed code, and then switch to the bug's branch to solve the problem, and finally go back to this point using
, so with the-m parameter, write the commit description in:$ git merge--no-ff-m "merge with No-ff The Dev"Store" The current Job site:$ git stashview a list of stored work sites:$ git stash listRestore the "storage" work site and also delete the stash content:$ git stash popRestore the "storage" work site without deleting sta
the project owner can analyze the program and give certain naming rules. For example, some projects are named based on the functional namespace and some projects are named based on the owner name. However, no matter which method is used, a reasonable namespace will not be reconstructed due to name conflicts when you cooperate with many people in large projects. Therefore, the js file in your site will include the namespace. js introduced first, which defines all namespaces and management for th
commits, you need the following command
1
git rebase -i HEAD~2
Using this command, you will enter an interactive interface that shows the last two commits, and asks you which to compress. The ideal state is your pick last commit and commit it and the previous one squash .Next you will be asked to fill in the descriptive information for the combined submission. This process actually overrides your commit history.8. Save changes that have not yet been submittedFor
for all branch history # git revert modification corresponding to the submission history # undo commit dfb02e6e4f2f7b573337763e5c0013802e3 92818git ls-tree HEAD # Internal Command: display a git object git rev-parse v2.0 # Internal Command: Display SHA1 HASHgit reflog for a ref # Show All commits, including the isolated node git show HEAD @ {5} git show master @ {yesterday} # display the status git log of the master branch yesterday -- pretty = format: '% h % s' -- graph # submit the log git sh
environment where a cache variable is used to cache all generated Namespaceobject objects.
A Namespaceobject object contains three attributes, stash (record current namespace), Fqn (namespace name), Proc (Createprocedure object). Methods include: Enqueue,call,valueof,merge,getstash,getexport
Copy Code code as follows:
Namespaceobject var = function _private_class_of_namespaceobject (FQN) {
Merge (this, {
information, others receive this information can be encrypted by the public key corresponding to the private key. So they can be sure that this information is coming from you (at least you're encrypting it). This private key is equivalent to a "signature". (You add the secret, you sign the word) And this is the principle behind code signing in iOS. Code Signing ObjectsThe things that are related to code signing are: Provisioning Profiles,app Ids,udids ... In this section, we will explain one b
core data to draw a chart that describes the relationships between these objects. This is a developer-specific ( Development Profile ), the publisher's diagram will have a small difference. Private key: After Mac OS X, key is managed by an app called Keychain. You can find it in the application\utilities. Running keychain, you can see which public and private keys are in your name. Similar to this:
(1) Go to itunes to get Udid (for example: 3fd281cf67b)(2). Mobileprovision is just A (description) Proflie, this mobileprovision is generated based on the device's UUID of the phone. If mobileprovision doesn't contain your udid, your device won't be able to measure it. Then go to the iphone website, according to the certificate. CER regenerates the profile that joins its own UUID, then imports the CER and the new profile into the Xcode project build to select the new Proflie,Double-click the (a
managed Server
Create an ops user in the managed server and set the password
useradd opspasswd ops
Configure sudo
# visudo
Addops ALL=(ALL) ALL
## Allow root to run any commands anywhereroot ALL=(ALL) ALLops ALL=(ALL) NOPASSWD:ALL
5. Upload the Public Key
Log on to the server and copy the public key of the ops user to the managed server. Replace the following IP addresses with your managed Server IP address.
ssh-copy-id -i /home/ops/.ssh/id_dsa.pub ops@192.168.1.200
At this poi
program, and switch and call the interface in the corresponding interface. [Note: Pay attention to the delay during interface switching, because sometimes the redirection fails to achieve the target when the interface is not created yet.] For the https problem of network requests, the default setting for Xcode7 is https, so it is in info. configure the following in the plist file:
------------------- I'm coming again ------------------------------- the ** error message "Certificate identity 'i
expires, here I have created a certificate, so see four certificates, click on the first one of the real Machine Debug certificate, you can delete (cautious!) and download, as for the download of what is the use, later will say. When you first come in, the list does not have a certificate, you need to click Gash in the upper right corner to create the certificate.After clicking the plus sign, the Certificate Type selection screen appears and we select the App Store's publishing certificate.In t
messaging (immediate messaging) of apps running, backstage, and other situations. For more information, see Watch Connectivity Framework reference . Keychain (Keychain)The keychain (Keychain) provides additional project protection options and a new secure enclave encryption key. The specific approach is:1. New Access
' detached head '. Can look around, make experimental
changes and commit them, and can discard any commits
Tate without impacting any branches by performing another.
If you are want to create a new branch to retain commits you create, your may does so
(now or later) by using-b with the Che Ckout command again. Example:
git checkout-b
Re-executiongit branch
* (head detached at 945A2F9)
3.0
3.2
unstable
You can see that you are on a temporary branch and if you want to dev
time cloning a copy of the code in the/home/le/workspace/git/repo2/directory of the B machine
$ git clone-b scala_dev le@192.168.6.1:/home/le/workspace/scala_test
$ git Branch #查看当前分支
#提交新的代码
$ Touch Test3.scala$ git Add Test3.scala$ git commit
$ git log #在push之前确认commit是否正确
$ git push
6. Back to/home/le/workspace/git/repo2/Update code
$ git pull #如果有错误, follow the error prompts to modify the. git/config fileB. Some issues that may be encountered 1. Merging multiple commits one commit has been
distant library
Git push–u (not required for the first time with-U) Origin master pushes the current master branch to the remote library
git clone https://github.com/idoxu/testgit cloning from a remote repository
git checkout–b dev Create dev branch and switch to Dev branch
Git branch view all current branches
Git checkout master switches back to the master branch
git merge dev branches on the current branch
git branch–d dev Delete Dev branch
GIT branch name to create a branch
Git
, delete, retrieve, reset modified files
git help
View File diff
git help
View Commit record
git log git log
TIG
you can use TIG instead of diff and Log,brew install TIG on your Mac
Git Local Branch ManagementView, toggle, create, and delete branches
Git br-r # View remote branch
git BR
Branch Merging and Reba
git merge
git patch management (for easy development of synchronization on multiple machines)
git merge
git Staging tube
Git
The content source of this page is from Internet, which doesn't represent Alibaba Cloud's opinion;
products and services mentioned on that page don't have any relationship with Alibaba Cloud. If the
content of the page makes you feel confusing, please write us an email, we will handle the problem
within 5 days after receiving your email.
If you find any instances of plagiarism from the community, please send an email to:
info-contact@alibabacloud.com
and provide relevant evidence. A staff member will contact you within 5 working days.