Forward模式,导致合并后删除原来的分支后,看不出主分支曾经合并过存档list恢复存档git stash apply 存档id删除存档git stash drop 存档id上面的恢复和删除可以用下面的命令合并操作git stash pop 存档id
When working in the current branch for a period of time temporarily need to switch to another branch, but the contents of the current branch cannot be submitted, this time can be used to use the command to log
, 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
. If you do, do not panic, because as long as git generally does not actively delete the contents of the local repository, depending on the situation you lost, can be retrieved, such as after the loss can use git reset--hard orig_head immediate recovery, or use Reflog command to view a reference to a previous branch.3.4 StashSometimes, we do some work on one branch and modify a lot of code, and then we need to switch to another branch to do something else. But do not want to do only half of the
, it's usually checkout to make sure there's no conflict.-M"Merge" //Tips for Merging*********************************************************************************************see the following situation to pay attention to conflict. Don't forget to resolve the conflict.*********************************************************************************************master should be published directly. So there should be no conflict when merging to master, so it is not recommended that multi
...//create and switch branches equivalent to git branch b_name git checkout b_nameGIT branch b_name//Create branch PS: Create branch clone from current branchgit checkout b_name//Toggle BranchGit branch//view Current Branch branch operation use this command plus option (-D Delete-D to delete an unincorporated branch) checkout just toggle (-B does not exist will be created)git merge b_name//merge current branch with specified branch--no-ff-m "commit_msg" commit record for this mergegit--graph--
, which is the default origin18, Git branch: View branch.Add:Git branch--set-upstream branch-name origin/branch-name: Create a link relationship between the native branch and the remote branch.Git branch--set-upstream-to=o/server_side_branch_name your_branch_name19, Git branch 20, Git checkout Add:git checkout git checkout "@{10 minutes Age}": Switch to version 10 minutes ago (Commit-id)Git checkout "@{5}": Switch to the 5th to the bottom of the Commit-id.21, Git checkout-b Add:Equivalent to the
In ~ /Directory
Create or modify a file gedit. gitconfig
Copy the following to the default configuration.
[Color]
Ui = auto
[User]
Name = w22ee
Email = w22ee@126.com
[Alias]
St = Status
Ci = commit
BR = Branch
CO = checkout
CVSup =! Sh-C \ "Git stash git cvsimport-v-K-I git rebase origin git stash pop \"
Svnup =! Sh-C \ "Git stash git SVN rebase git
Git rm Git rm -- cached
Storage and recovery
Git stash # store the current jobGit stash list # view the storage siteGit stash apply # restore the work site. The stash content is not deleted.Git stash pop # restore the work site and delete the
branch. You can merge them on the dev branch from time to time.
3. Bug Branch
Git provides a stash function to "Store" the current work site and resume the work after it recovers:
$ git stash
Restore and delete the stash after fixing the bug.
$ git stash pop
View stash
$ gi
with which the application interacts
Decrypt AppStore binaries:the. IPA is decrypted at runtime by the kernel ' s Mach loader. Cydia has several applications available:crackulous, appcrack and clutch. Also, you can use GDB. The "cryptid" field of the Lc_encryption_info identifies if the application is encrypted or not. Use Otool–l
Determine the architecture the application was compiled for:otool–f
Get information about what functions, classes and methods is referenced in the application
ICloud is a cloud synchronization tool provided by Apple to users. It is mainly used to easily restore the same information on previous devices when devices are lost or new devices are purchased. However, after a user's Apple ID is stolen, the user data may be stolen. ICloud backup-related information about iCloud, which Apple provides in Support [^ 1]:### ICloud backup information* Photo and video * device settings * App data (including: Keychain, da
(all of the two items may exist, only if they are removed). Download the new Apple Developer Certificate Https://developer.apple.com/certificationauthority/AppleWWDRCA.cer and double-click Install, then look at the Applewwdrca certificate in the keychain has been prompted for "This certificate is valid", such as if it was previously used and is already a valid certificate, ignore the first step in the preparation process. Certificate is the qualific
certificates fall into two categories: development and distribution.
Development certificates are used to develop and debug applications: A Development certificate identifies you, as a team member, in a development provisioning proFile that allows the apps signed by the launch on devices.
Distribution is primarily used to distribute applications (depending on the type of certificate): A Distribution certificate identifies your team or organization in a Distribution provisionin
, select "Submit" Submission, reconfirm you can see the app ID you just created on the "app IDs" page:Generate a certificate Request fileWhether you are applying for a development (development) certificate or a publish (distribution) certificate, you need to use a certificate request (. certsigningrequest) file, and the certificate request file needs to use "Keychain Access" on Mac OS Tool generation.Search for "K
time, you can choose to directly close the notebook. However, the original running process will hang or end, if you are downloading, then the download will be suspended (sometimes can not recover), if the network service is being provided, then because the network is broken, others can not connect your notebook. Lock screen can solve this problem, under Windows with Win+l shortcut keys on the lock screen, but Mac OS X has not been the default shortcut keys.
MacOS default lock screen shortcut
First, Reason:Before because the server can only login, and limit the root account login, so ssh through all the server, to achieve the public key forward SCP free password, etc., greatly facilitate the management of the server.Recently there is a need to do offsite backup of data. The simplest use of SCP script, but script manual execution is OK, put crontab does not work properly.Second, the solution:Script execution failed, immediately thought to print verbose log debug, that scp-v then read
) (delete an associated remote database name)Git remote-V (list the names of associated remote libraries)Git clone [email protected]: path/repo-name.git (clone a remote library to a local, clone the master branch by default)Git checkout-B Dev origin/dev (create a local branch, switch to the branch, and associate the branch of a remote database to the local branch)Git log -- Graph (view branch merge graph)Git merge -- no-FF-M "merge with no-FF" branch nameGit
details stash // a cache mechanism Status // view git status gitk // graphical interface to view all the COMIT of the current branch, similar to the gitlog GUI version
Most git commands require the current directory (or the ancestor directory of the current directory) to exist. the GIT folder can be executed only in the following situations: 1. git config -- Global xxxx // git global settings 2. git init // initialize git3. git clone // copy Reposito
-commitWhen a bug is temporarily modified, to ensure that the current workspace looks cleanTo store the current unfinished work site.Git stashView a stored workspacegit stash List[Email protected] {0}: WIP on b1:38b2a71 Modify p.phpRecovering a stored workspacegit stash apply [email protected]{0} (after recovery stash content is not deleted) need to use Git
filesgitls-files-tShow all untracked branchesgitls-files--othersShow all ignored filesgitls-files--others-i--exclude-standardgitcheck-ignore*gitstatus--ignoredManipulation: OperationStops tracing a file but does not delete it.gitrm--cachedOrgitrm--cached-rForce Delete untracked files or directoriesgitclean-fgitclean-f-dgitclean-dfClear. gitignoregitclean-X-fChanges: ModifyInfo: View informationView unsaved files after last submissiongitdiffView the files for temporary changes to be submittedgit
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.